svn_rev_147

remove env_*.o, add env.o

1 files changed, 4 insertions, 9 deletions

diff --git a/common/Makefile b/common/Makefile
index e22c76648c..915ea69f30 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -9,9 +9,7 @@ obj-y += flash.o
 #obj-y += cmd_cache.o
 #obj-y += cmd_ext2.o
 #obj-y += cmd_jffs2.o
-obj-y += cmd_nvedit.o
 #obj-y += cmd_vfd.o
-obj-y += env_common.o
 #obj-y += memsize.o
 #obj-y += usb_kbd.o
 #obj-y += bedbug.o
@@ -32,8 +30,7 @@ obj-$(CONFIG_CMD_LOADS) += cmd_loads.o
 #obj-y += cmd_log.o
 #obj-y += cmd_pcmcia.o
 obj-y += command.o
-#obj-y += env_eeprom.o
-#obj-y += hush.o
+obj-y += hush.o
 #obj-y += miiphyutil.o
 #obj-y += virtex2.o
 #obj-y += cmd_ace.o
@@ -42,14 +39,12 @@ obj-y += command.o
 #obj-y += cmd_mac.o
 #obj-y += cmd_portio.o
 obj-y += console.o
-obj-y += env_flash.o
 #obj-y += serial.o
 obj-$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o
 #obj-y += cmd_diag.o
 obj-$(CONFIG_CMD_FLASH) += cmd_flash.o
 obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o
 #obj-y += cmd_reginfo.o
-obj-y += environment.o
 #obj-y += kgdb.o
 #obj-y += soft_i2c.o
 #obj-y += cmd_bdinfo.o
@@ -57,7 +52,6 @@ obj-y += environment.o
 #obj-y += cmd_fpga.o
 obj-$(CONFIG_CMD_MII) += cmd_mii.o
 #obj-y += cmd_reiser.o
-#obj-y += env_nand.o
 #obj-y += lcd.o
 #obj-y += soft_spi.o
 #obj-y += cmd_bedbug.o
@@ -65,14 +59,12 @@ obj-$(CONFIG_CMD_MII) += cmd_mii.o
 obj-$(CONFIG_CMD_I2C) += cmd_i2c.o
 #obj-y += cmd_misc.o
 #obj-y += cmd_scsi.o
-#obj-y += env_nowhere.o
 #obj-y += cmd_bmp.o
 #obj-y += cmd_dtt.o
 #obj-y += cmd_ide.o
 #obj-y += cmd_mmc.o
 #obj-y += cmd_spi.o
 obj-y += dlmalloc.o
-#obj-y += env_nvram.o
 #obj-y += lynxkdi.o
 obj-y += cmd_boot.o
 #obj-y += cmd_eeprom.o
@@ -93,3 +85,6 @@ obj-$(CONFIG_CMD_SPLASH) += cmd_splash.o
 # obj-y += cyclon2.o
 obj-$(CONFIG_CMD_SLEEP)	+= cmd_misc.o
 obj-y	+= mtdpart.o
+
+obj-y += env.o
+