patch-2.3.20 linux/arch/ppc/kernel/Makefile

• Lines: 96
• Date: Thu Oct 7 10:17:08 1999
• Orig file: v2.3.19/linux/arch/ppc/kernel/Makefile
• Orig date: Fri Sep 10 23:57:28 1999

diff -u --recursive --new-file v2.3.19/linux/arch/ppc/kernel/Makefile linux/arch/ppc/kernel/Makefile
@@ -12,48 +12,83 @@
 
 O_TARGET := kernel.o
 OX_OBJS := ppc_ksyms.o setup.o
+KHEAD := head.o
 
+ifdef CONFIG_PPC_ALL
+CONFIG_PMAC=y
+CONFIG_PREP=y
+CONFIG_CHRP=y
+endif
 
 O_OBJS := entry.o traps.o irq.o idle.o time.o process.o signal.o syscalls.o \
 	  misc.o bitops.o ptrace.o align.o ppc_htab.o semaphore.o
+
 ifndef CONFIG_8xx
 O_OBJS += hashtable.o
 endif
+
 ifdef CONFIG_PCI
 O_OBJS += pci.o
 endif
+
 ifdef CONFIG_KGDB
 O_OBJS += ppc-stub.o
 endif
+
 ifdef CONFIG_TOTALMP
 O_OBJS += totalmp.o
 endif
 
-ifeq ($(CONFIG_MBX),y)
-O_OBJS += mbx_setup.o mbx_pci.o i8259.o ppc8xx_pic.o
+ifdef CONFIG_PMAC_PBOOK
+O_OBJS += sleep.o
+endif
+
+ifdef CONFIG_SMP
+O_OBJS += smp.o
+endif
+
+ifeq ($(CONFIG_8xx),y)
+KHEAD := head_8xx.o
+O_OBJS += m8xx_setup.o ppc8xx_pic.o
+ifndef CONFIG_MATH_EMULATION
+O_OBJS += softemu8xx.o
+endif
+ifdef CONFIG_PCI
+O_OBJS += qspan_pci.c
+endif
+ifdef CONFIG_MBX
+O_OBJS += i8259.o
+endif
 else
 ifeq ($(CONFIG_APUS),y)
 O_OBJS += apus_setup.o prom.o open_pic.o
 else
-ifneq ($(CONFIG_MBX),y)
-O_OBJS += prep_time.o pmac_time.o chrp_time.o \
-	  pmac_setup.o pmac_support.o \
-	  prep_pci.o pmac_pci.o chrp_pci.o \
-	  residual.o prom.o open_pic.o feature.o \
-	  prep_nvram.o i8259.o pmac_pic.o indirect_pci.o \
+ifneq ($(CONFIG_8xx),y)
+O_OBJS += chrp_setup.o chrp_pci.o chrp_time.o \
+	  pmac_time.o pmac_support.o pmac_pci.o pmac_setup.o \
+	  prom.o open_pic.o feature.o \
+	  i8259.o pmac_pic.o indirect_pci.o \
 	  gemini_pci.o gemini_prom.o gemini_setup.o
-OX_OBJS += chrp_setup.o prep_setup.o
+
+ifeq ($(CONFIG_PREP), y)
+O_OBJS += prep_pci.o prep_setup.o prep_nvram.o prep_time.o residual.o
 endif
+
+ifeq ($(CONFIG_PMAC), y)
 endif
+
+ifeq ($(CONFIG_PMAC), y)
 endif
 
-ifdef CONFIG_SMP
-O_OBJS += smp.o
+endif
+endif
 endif
 
-all: head.o kernel.o
+all: $(KHEAD) kernel.o
 
 head.o: head.S ppc_defs.h
+
+head_8xx.o: head_8xx.S ppc_defs.h
 
 ppc_defs.h: mk_defs.c ppc_defs.head \
 		$(TOPDIR)/include/asm/mmu.h \