summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-03-28 22:05:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-28 22:05:10 +0100
commitae574a5d7aa1d80469dfcbaa757db2bea536ee66 (patch)
tree6cfa7750df998359295227b76256d488f6d39d19 /arch/arm/Makefile
parentc4713074375c61f939310b04e92090afe29810dc (diff)
parentc760fc1997e8156ebc4134c42c18f68137c689f9 (diff)
downloadlinux-ae574a5d7aa1d80469dfcbaa757db2bea536ee66.tar.gz
linux-ae574a5d7aa1d80469dfcbaa757db2bea536ee66.tar.bz2
linux-ae574a5d7aa1d80469dfcbaa757db2bea536ee66.zip
Merge nommu tree
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile9
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