patch-2.3.16 linux/arch/arm/mm/Makefile

Next file: linux/arch/arm/mm/fault-armv.c
Previous file: linux/arch/arm/lib/semaphore.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/arch/arm/mm/Makefile linux/arch/arm/mm/Makefile
@@ -7,26 +7,30 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
-all:	lib first_rule
+O_TARGET	:= mm.o
+O_OBJS		:= init.o extable.o fault-$(PROCESSOR).o small_page.o
 
-O_TARGET := mm.o
-O_OBJS   := init.o extable.o fault-$(PROCESSOR).o small_page.o
-
-ifeq ($(PROCESSOR),armo)
- O_OBJS += proc-arm2,3.o
+ifeq ($(CONFIG_CPU_26),y)
+  O_OBJS	+= proc-arm2,3.o
 endif
 
-ifeq ($(PROCESSOR),armv)
- O_OBJS += mm-$(MACHINE).o proc-arm6,7.o proc-sa110.o ioremap.o
+ifeq ($(CONFIG_CPU_32),y)
+  ifeq ($(CONFIG_CPU_ARM6),y)
+    P_OBJS	+= proc-arm6,7.o
+  endif
+  ifeq ($(CONFIG_CPU_ARM7),y)
+    P_OBJS	+= proc-arm6,7.o
+  endif
+  ifeq ($(CONFIG_CPU_SA110),y)
+    P_OBJS	+= proc-sa110.o
+  endif
+  O_OBJS	+= mm-$(MACHINE).o ioremap.o $(sort $(P_OBJS))
 endif
 
 include $(TOPDIR)/Rules.make
 
 %.o: %.S
 	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $<
-
-.PHONY:	lib
-lib:;	@$(MAKE) -C ../lib constants.h
 
 # Special dependencies
 fault-armv.o: fault-common.c

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)