Merge branch 'master' into next

[u-boot] / cpu / i386 / Makefile

diff --git a/cpu/i386/Makefile b/cpu/i386/Makefile
index cd46dea2c7401fdb0bef839117f86cc086b50631..c658c6e45919213ddb576f5898744b2c7453c921 100644 (file)
--- a/cpu/i386/Makefile
+++ b/cpu/i386/Makefile
@@ -1,7 +1,7 @@
 #
 # (C) Copyright 2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-# 
+#
 # (C) Copyright 2002
 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
 #
@@ -28,9 +28,8 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(CPU).a
 
-START  = start.o start16.o reset.o
-COBJS  = serial.o interrupts.o cpu.o timer.o sc520.o
-SOBJS  = sc520_asm.o
+START  = start.o start16.o resetvec.o
+COBJS  = serial.o interrupts.o cpu.o
 
 SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -39,7 +38,7 @@ START := $(addprefix $(obj),$(START))
 all:   $(obj).depend $(START) $(LIB)
 
 $(LIB):        $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################