Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 250d375d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge nommu branch

parents 84904d0e 6afd6fae

arch/arm/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ config ARCH_MTD_XIP 


config VECTORS_BASE

	hex

	default 0xffff0000 if MMU

	default 0xffff0000 if MMU || CPU_HIGH_VECTOR

	default DRAM_BASE if REMAP_VECTORS_TO_RAM

	default 0x00000000

	help
@@ -626,6 +626,7 @@ config LEDS_CPU 


config ALIGNMENT_TRAP

	bool

	depends on CPU_CP15_MMU

	default y if !ARCH_EBSA110

	help

	  ARM processors can not fetch/store information which is not
@@ -857,7 +858,7 @@ source "drivers/base/Kconfig" 


source "drivers/connector/Kconfig"



if ALIGNMENT_TRAP

if ALIGNMENT_TRAP || !CPU_CP15_MMU

source "drivers/mtd/Kconfig"

endif

arch/arm/Kconfig-nommu

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ config FLASH_SIZE 
	hex 'FLASH Size' if SET_MEM_PARAM

	default 0x00400000



config PROCESSOR_ID

	hex

	default 0x00007700

	depends on !CPU_CP15

	help

	  If processor has no CP15 register, this processor ID is

	  used instead of the auto-probing which utilizes the register.



config REMAP_VECTORS_TO_RAM

	bool 'Install vectors to the begining of RAM' if DRAM_BASE

	depends on DRAM_BASE

arch/arm/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -55,7 +55,12 @@ arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3 
# This selects how we optimise for the processor.

tune-$(CONFIG_CPU_ARM610)	:=-mtune=arm610

tune-$(CONFIG_CPU_ARM710)	:=-mtune=arm710

tune-$(CONFIG_CPU_ARM7TDMI)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM720T)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM740T)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM9TDMI)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM940T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM946T)	:=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)

tune-$(CONFIG_CPU_ARM920T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM922T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM925T)	:=-mtune=arm9tdmi

arch/arm/boot/compressed/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -51,7 +51,11 @@ OBJS += head-at91rm9200.o 
endif



ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)

ifeq ($(CONFIG_CPU_CP15),y)

OBJS		+= big-endian.o

else

# The endian should be set by h/w design.

endif

endif



#

arch/arm/boot/compressed/head.S

+6 −0
Original line number Diff line number Diff line
@@ -82,9 +82,11 @@ 
		kphex	r6, 8		/* processor id */

		kputc	#':'

		kphex	r7, 8		/* architecture id */

#ifdef CONFIG_CPU_CP15

		kputc	#':'

		mrc	p15, 0, r0, c1, c0

		kphex	r0, 8		/* control reg */

#endif

		kputc	#'\n'

		kphex	r5, 8		/* decompressed kernel start */

		kputc	#'-'
@@ -507,7 +509,11 @@ call_kernel: bl cache_clean_flush 
 */



call_cache_fn:	adr	r12, proc_types

#ifdef CONFIG_CPU_CP15

		mrc	p15, 0, r6, c0, c0	@ get processor ID

#else

		ldr	r6, =CONFIG_PROCESSOR_ID

#endif

1:		ldr	r1, [r12, #0]		@ get value

		ldr	r2, [r12, #4]		@ get mask

		eor	r1, r1, r6		@ (real ^ match)