summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/Makefile')
-rw-r--r--arch/arm/mm/Makefile28
1 files changed, 7 insertions, 21 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index fe3cf5eac..5cc3ff520 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -9,12 +9,11 @@
USE_STANDARD_AS_RULE := true
-EXTRA_AFLAGS := -traditional
O_TARGET := mm.o
# Object file lists.
-obj-y := extable.o fault-$(PROCESSOR).o init.o \
+obj-y := extable.o fault-common.o fault-$(PROCESSOR).o init.o \
mm-$(PROCESSOR).o small_page.o
obj-m :=
obj-n :=
@@ -22,10 +21,10 @@ obj- :=
export-objs := proc-syms.o
p-$(CONFIG_CPU_26) += proc-arm2,3.o
-p-$(CONFIG_CPU_ARM6) += proc-arm6,7.o
-p-$(CONFIG_CPU_ARM7) += proc-arm6,7.o
-p-$(CONFIG_CPU_ARM720) += proc-arm720.o
-p-$(CONFIG_CPU_ARM920) += proc-arm920.o
+p-$(CONFIG_CPU_ARM610) += proc-arm6,7.o
+p-$(CONFIG_CPU_ARM710) += proc-arm6,7.o
+p-$(CONFIG_CPU_ARM720T) += proc-arm720.o
+p-$(CONFIG_CPU_ARM920T) += proc-arm920.o
p-$(CONFIG_CPU_ARM10) += proc-arm10.o
p-$(CONFIG_CPU_SA110) += proc-sa110.o
p-$(CONFIG_CPU_SA1100) += proc-sa110.o
@@ -37,29 +36,16 @@ endif
# Integrator follows "new style"
# Soon, others will do too, and we can get rid of this
-MMMACH := mm-$(MACHINE).o
+MMMACH := mm-$(MACHINE).c
ifeq ($(MMMACH),$(wildcard $(MMMACH)))
-obj-$(CONFIG_CPU_32) += $(MMMACH)
+obj-$(CONFIG_CPU_32) += $(MMMACH:.c=.o)
endif
obj-y += $(sort $(p-y))
-# Files that are both resident and modular; remove from modular.
-
-obj-m := $(filter-out $(obj-y), $(obj-m))
-
-# Translate to Rules.make lists.
-
-O_OBJS := $(filter-out $(export-objs), $(obj-y))
-OX_OBJS := $(filter $(export-objs), $(obj-y))
-M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
-
include $(TOPDIR)/Rules.make
# Special dependencies
-fault-armv.o: fault-common.c
-fault-armo.o: fault-common.c
proc-arm2,3.o: ../lib/constants.h
proc-arm6,7.o: ../lib/constants.h
proc-arm720.o: ../lib/constants.h