Merge branch 'next' of ../next

[platform/kernel/u-boot.git] / lib_i386 / Makefile

diff --git a/lib_i386/Makefile b/lib_i386/Makefile
index fb4184b..9838506 100644 (file)
--- a/lib_i386/Makefile
+++ b/lib_i386/Makefile
@@ -32,14 +32,16 @@ SOBJS-y     += realmode_switch.o
 COBJS-y        += bios_setup.o
 COBJS-y        += board.o
 COBJS-y        += bootm.o
-COBJS-y        += pci.o
-COBJS-y        += pci_type1.o
+COBJS-y        += interrupts.o
+COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
+COBJS-$(CONFIG_SYS_GENERIC_TIMER) += pcat_timer.o
+COBJS-$(CONFIG_PCI) += pci.o
+COBJS-$(CONFIG_PCI) += pci_type1.o
 COBJS-y        += realmode.o
+COBJS-y        += timer.o
 COBJS-y        += video_bios.o
 COBJS-y        += video.o
 COBJS-y        += zimage.o
-COBJS-y        += interrupts.o
-COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))