Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[platform/kernel/u-boot.git] / cpu / ppc4xx / Makefile

diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile
index 9155e9a..88d53fb 100644 (file)
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@ -33,23 +33,30 @@ SOBJS       += dcr.o
 SOBJS  += kgdb.o
 
 COBJS  := 40x_spd_sdram.o
+
 COBJS  += 44x_spd_ddr.o
 COBJS  += 44x_spd_ddr2.o
-COBJS  += 4xx_enet.o
+ifdef CONFIG_PPC4xx_DDR_AUTOCALIBRATION
+COBJS  += 4xx_ibm_ddr2_autocalib.o
+endif
 COBJS  += 4xx_pci.o
 COBJS  += 4xx_pcie.o
-COBJS  += 4xx_uart.o
 COBJS  += bedbug_405.o
+ifdef CONFIG_CMD_CHIP_CONFIG
+COBJS  += cmd_chip_config.o
+endif
 COBJS  += commproc.o
 COBJS  += cpu.o
 COBJS  += cpu_init.o
+COBJS  += denali_data_eye.o
+COBJS  += denali_spd_ddr2.o
+COBJS  += ecc.o
 COBJS  += fdt.o
-COBJS  += gpio.o
-COBJS  += i2c.o
 COBJS  += interrupts.o
 COBJS  += iop480_uart.o
-COBJS  += miiphy.o
-COBJS  += ndfc.o
+ifdef CONFIG_CMD_REGINFO
+COBJS  += reginfo.o
+endif
 COBJS  += sdram.o
 COBJS  += speed.o
 COBJS  += tlb.o
@@ -57,6 +64,14 @@ COBJS        += traps.o
 COBJS  += usb.o
 COBJS  += usb_ohci.o
 COBJS  += usbdev.o
+ifndef CONFIG_XILINX_440
+COBJS  += 4xx_uart.o
+COBJS  += gpio.o
+COBJS  += miiphy.o
+COBJS  += uic.o
+else
+COBJS  += xilinx_irq.o
+endif
 
 SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))