Merge with /home/tur/proj/v38b/u-boot

[karo-tx-uboot.git] / common / Makefile

diff --git a/common/Makefile b/common/Makefile
index d626fe4d4ba6ae2c8dbba9a56ef40a9d36f8cf35..0106088e242de968e1fddaff159bb66e8aae7dba 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -41,7 +41,7 @@ COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o \
          cmd_pci.o cmd_pcmcia.o cmd_portio.o \
          cmd_reginfo.o cmd_reiser.o cmd_scsi.o cmd_spi.o cmd_universe.o \
          cmd_usb.o cmd_vfd.o \
-         command.o console.o devices.o dlmalloc.o docecc.o \
+         command.o console.o cyclon2.o devices.o dlmalloc.o docecc.o \
          environment.o env_common.o \
          env_nand.o env_dataflash.o env_flash.o env_eeprom.o \
          env_nvram.o env_nowhere.o \
@@ -51,7 +51,7 @@ COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o \
          memsize.o miiphybb.o miiphyutil.o \
          s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
          usb.o usb_kbd.o usb_storage.o \
-         virtex2.o xilinx.o crc16.o xyzModem.o
+         virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o
 
 SRCS   := $(AOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(AOBJS) $(COBJS))
@@ -61,7 +61,7 @@ CPPFLAGS += -I..
 all:   $(LIB) $(AOBJS)
 
 $(LIB): $(obj).depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 $(obj)environment.o: $(src)environment.c $(obj)../tools/envcrc
        $(CC) $(AFLAGS) -Wa,--no-warn \