Merge branch 'master' of /home/wd/git/u-boot/master/

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

diff --git a/common/Makefile b/common/Makefile
index c71b228..4287108 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -102,6 +102,7 @@ COBJS-y += cmd_vfd.o
 COBJS-y += command.o
 COBJS-y += console.o
 COBJS-y += cyclon2.o
+COBJS-y += stratixII.o
 COBJS-y += devices.o
 COBJS-y += dlmalloc.o
 COBJS-y += docecc.o
@@ -112,12 +113,12 @@ COBJS-y += env_dataflash.o
 COBJS-y += env_flash.o
 COBJS-y += env_eeprom.o
 COBJS-y += env_onenand.o
+COBJS-y += env_sf.o
 COBJS-y += env_nvram.o
 COBJS-y += env_nowhere.o
 COBJS-y += exports.o
 COBJS-y += flash.o
 COBJS-y += fpga.o
-COBJS-y += ft_build.o
 COBJS-y += hush.o
 COBJS-y += kgdb.o
 COBJS-y += lcd.o
@@ -142,6 +143,7 @@ COBJS-y += xyzModem.o
 COBJS-y += cmd_mac.o
 COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
 COBJS-$(CONFIG_MP) += cmd_mp.o
+COBJS-$(CONFIG_CMD_SF) += cmd_sf.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(AOBJS:.o=.S) $(COBJS:.o=.c)