summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-09-05 12:50:28 +0200
committerSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-09-05 12:50:28 +0200
commit1cdc2fe996265878599f0b6d87d964daa8ffc1b3 (patch)
tree55ca048056c0a5f26f6afddd1ee7438771b32f94 /arch/arm/cpu/Makefile
parent7989a989b91f0184a1e6f437be1e2ec47bf3d10d (diff)
downloadbarebox-1cdc2fe996265878599f0b6d87d964daa8ffc1b3.tar.gz
barebox-1cdc2fe996265878599f0b6d87d964daa8ffc1b3.tar.xz
consolidate arch/arm/cpu/start-arm920t.S and arch/arm/cpu/start-arm926ejs.S
Diffstat (limited to 'arch/arm/cpu/Makefile')
-rw-r--r--arch/arm/cpu/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
index 4670c8b696..46ba6ac073 100644
--- a/arch/arm/cpu/Makefile
+++ b/arch/arm/cpu/Makefile
@@ -1,4 +1,10 @@
obj-y += cpu.o
obj-y += interrupts.o
-obj-y += start-arm920t.o
+#
+# start-arm920t.S and start-arm926ejs.S have been
+# merged to start-arm920t.S. More start-*.S should
+# be merged here and finally called start-arm.S
+#
+extra-$(CONFIG_ARM920T) += start-arm920t.o
+extra-$(CONFIG_ARM926EJS) += start-arm920t.o