diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-28 23:05:10 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-28 23:05:10 +0200 |
commit | ae574a5d7aa1d80469dfcbaa757db2bea536ee66 (patch) | |
tree | 6cfa7750df998359295227b76256d488f6d39d19 /arch/arm/Makefile | |
parent | [ARM] 3388/1: ixp23xx: add core ixp23xx support (diff) | |
parent | [ARM] nommu: fixups for the exception vectors (diff) | |
download | linux-ae574a5d7aa1d80469dfcbaa757db2bea536ee66.tar.xz linux-ae574a5d7aa1d80469dfcbaa757db2bea536ee66.zip |
Merge nommu tree
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ce3e804ea0f3..95a96275f88a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -20,6 +20,11 @@ GZFLAGS :=-9 # Select a platform tht is kept up-to-date KBUILD_DEFCONFIG := versatile_defconfig +# defines filename extension depending memory manement type. +ifeq ($(CONFIG_MMU),) +MMUEXT := -nommu +endif + ifeq ($(CONFIG_FRAME_POINTER),y) CFLAGS +=-fno-omit-frame-pointer -mapcs -mno-sched-prolog endif @@ -73,7 +78,7 @@ AFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float CHECKFLAGS += -D__arm__ #Default value -head-y := arch/arm/kernel/head.o arch/arm/kernel/init_task.o +head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o textofs-y := 0x00008000 machine-$(CONFIG_ARCH_RPC) := rpc @@ -133,7 +138,7 @@ else MACHINE := endif -export TEXT_OFFSET GZFLAGS +export TEXT_OFFSET GZFLAGS MMUEXT # Do we have FASTFPE? FASTFPE :=arch/arm/fastfpe |