patch-2.3.23 linux/arch/arm/kernel/Makefile

• Lines: 65
• Date: Wed Oct 20 16:29:08 1999
• Orig file: v2.3.22/linux/arch/arm/kernel/Makefile
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.22/linux/arch/arm/kernel/Makefile linux/arch/arm/kernel/Makefile
@@ -22,6 +22,7 @@
 O_OBJS_ebsa110    = dma-dummy.o
 O_OBJS_footbridge = dma-footbridge.o $(ISA_DMA_OBJS) isa.o
 O_OBJS_nexuspci   = dma-dummy.o
+O_OBJS_sa1100     = dma-dummy.o fiq.o
 
 OX_OBJS_arc	  = dma.o
 OX_OBJS_a5k	  = dma.o
@@ -29,11 +30,16 @@
 OX_OBJS_ebsa110	  = 
 OX_OBJS_footbridge= dma.o hw-footbridge.o
 OX_OBJS_nexuspci  =
+OX_OBJS_sa1100    =
 
 all: kernel.o $(HEAD_OBJ) init_task.o
 
 O_OBJS += $(O_OBJS_$(MACHINE))
 
+ifeq ($(CONFIG_DEBUG_LL),y)
+  O_OBJS += debug-$(PROCESSOR).o
+endif
+
 ifeq ($(CONFIG_MODULES),y)
   OX_OBJS = armksyms.o
 endif
@@ -42,17 +48,15 @@
   OX_OBJS += ecard.o
 endif
 
-ifeq ($(MACHINE),nexuspci)
-  ifdef CONFIG_PCI
+ifeq ($(CONFIG_PCI),y)
+  ifeq ($(MACHINE),nexuspci)
     O_OBJS += plx9080.o
-  endif
-else
-  ifdef CONFIG_PCI
+  else
     O_OBJS += bios32.o dec21285.o
   endif
 endif
 
-ifdef CONFIG_LEDS
+ifeq ($(CONFIG_LEDS),y)
   OX_OBJS += leds-$(MACHINE).o
 endif
 
@@ -73,13 +77,11 @@
 $(HEAD_OBJ): $(HEAD_OBJ:.o=.S)
 	$(CC) -D__ASSEMBLY__ -DTEXTADDR=$(TEXTADDR) -traditional -c $(HEAD_OBJ:.o=.S) -o $@
 
-$(ENTRY_OBJ): $(ENTRY_OBJ:.o=.S)
-	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c $(ENTRY_OBJ:.o=.S) -o $@
-
 include $(TOPDIR)/Rules.make
 
-$(ENTRY_OBJ): ../lib/constants.h
+.S.o:
+	$(CC) -D__ASSEMBLY__ $(AFLAGS) $(AFLAGS_$@) -c -o $*.o $<
 
 # Spell out some dependencies that `make dep' doesn't spot
-entry-armv.o: calls.S
-entry-armo.o: calls.S
+entry-armv.o: calls.S ../lib/constants.h
+entry-armo.o: calls.S ../lib/constants.h