i386: Reorder source objects in lib_i386 Makefile

[u-boot] / lib_i386 / Makefile

diff --git a/lib_i386/Makefile b/lib_i386/Makefile
index 8dc809e1e24fdae7082c81813348b884352870e8..9838506689c079beb4466b349d639b69dd60da86 100644 (file)
--- a/lib_i386/Makefile
+++ b/lib_i386/Makefile
@@ -25,16 +25,29 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(ARCH).a
 
-SOBJS  = bios.o bios_pci.o realmode_switch.o
-
-COBJS  = board.o bios_setup.o i386_linux.o zimage.o realmode.o \
-         pci_type1.o pci.o video_bios.o video.o
-
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+SOBJS-y        += bios.o
+SOBJS-y        += bios_pci.o
+SOBJS-y        += realmode_switch.o
+
+COBJS-y        += bios_setup.o
+COBJS-y        += board.o
+COBJS-y        += bootm.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
+
+SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################