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

Next file: linux-2.4.23/arch/ppc/kernel/cputable.c
Previous file: linux-2.4.23/arch/ppc/configs/rpxlite_defconfig
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/arch/ppc/kernel/Makefile linux-2.4.23/arch/ppc/kernel/Makefile
@@ -24,13 +24,15 @@
 HEAD-y				:= head.o
 HEAD-$(CONFIG_6xx)		+= idle_6xx.o
 HEAD-$(CONFIG_40x)		:= head_4xx.o
+HEAD-$(CONFIG_44x)		:= head_44x.o
 HEAD-$(CONFIG_8xx)		:= head_8xx.o
 
 all: $(HEAD-y) kernel.o
 
 O_TARGET := kernel.o
 
-export-objs			:= ppc_ksyms.o time.o ocp.o ppc4xx_setup.o
+export-objs			:= ppc_ksyms.o time.o ocp.o ppc4xx_setup.o \
+					ppc4xx_dma.o ppc4xx_sgdma.o
 
 obj-y				:= entry.o traps.o irq.o idle.o time.o misc.o \
 					process.o signal.o ptrace.o align.o \
@@ -51,12 +53,16 @@
 obj-$(CONFIG_KGDB)		+= gen550_kgdb.o gen550_dbg.o
 obj-$(CONFIG_SERIAL_TEXT_DEBUG)	+= gen550_dbg.o
 endif
-obj-$(CONFIG_4xx)		+= todc_time.o
-obj-$(CONFIG_40x)		+= ppc4xx_setup.o ocp.o
-obj-$(CONFIG_40x)		+= ppc4xx_pic.o
+obj-$(CONFIG_40x)		+= ppc4xx_setup.o
+obj-$(CONFIG_4xx)		+= ocp.o ppc4xx_pic.o todc_time.o
 ifeq ($(CONFIG_PCI),y)
-obj-$(CONFIG_40x)		+= ppc405_pci.o indirect_pci.o pci_auto.o
+obj-$(CONFIG_40x)		+= ppc405_pci.o
+obj-$(CONFIG_4xx)		+= indirect_pci.o pci_auto.o
 endif
+obj-$(CONFIG_44x)		+= ibm44x_common.o
+obj-$(CONFIG_440GP)		+= ibm440gp_common.o
+obj-$(CONFIG_PPC4xx_DMA)	+= ppc4xx_dma.o
+obj-$(CONFIG_PPC4xx_EDMA)	+= ppc4xx_sgdma.o
 obj-$(CONFIG_8xx)		+= m8xx_setup.o ppc8xx_pic.o
 ifeq ($(CONFIG_8xx),y)
 obj-$(CONFIG_PCI)		+= qspan_pci.o
@@ -84,6 +90,7 @@
 l2cr.o: l2cr.S ppc_defs.h
 head.o: head.S ppc_defs.h
 head_4xx.o: head_4xx.S ppc_defs.h
+head_44x.o: head_44x.S ppc_defs.h
 head_8xx.o: head_8xx.S ppc_defs.h
 idle_6xx.o: idle_6xx.S ppc_defs.h
 

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