From 717a222229fdb77703e9174d0eb08a4b41febf49 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 28 Aug 2008 12:31:48 +0200 Subject: gunzip: move to lib_generic Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index 944b1c08ad..d974823a4b 100644 --- a/common/Makefile +++ b/common/Makefile @@ -36,7 +36,6 @@ COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o COBJS-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o COBJS-y += image.o -COBJS-y += gunzip.o COBJS-y += cmd_boot.o COBJS-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o COBJS-y += cmd_bootm.o -- cgit From 4d75e0aa9caca64d4a1d55d95cd1ca5f30d9fc56 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 28 Aug 2008 12:31:51 +0200 Subject: soft_i2c: move to drivers/i2c Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index d974823a4b..faeac86dc1 100644 --- a/common/Makefile +++ b/common/Makefile @@ -137,7 +137,6 @@ COBJS-$(CONFIG_BITBANGMII) += miiphybb.o COBJS-y += miiphyutil.o COBJS-y += s_record.o COBJS-y += serial.o -COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o ifdef CONFIG_CMD_USB COBJS-y += usb.o -- cgit From e8314035996a9118ac5948df2ff8a2f2161ed67a Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 28 Aug 2008 12:31:51 +0200 Subject: soft_spi: move to drivers/spi Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index faeac86dc1..3e4829f475 100644 --- a/common/Makefile +++ b/common/Makefile @@ -137,7 +137,6 @@ COBJS-$(CONFIG_BITBANGMII) += miiphybb.o COBJS-y += miiphyutil.o COBJS-y += s_record.o COBJS-y += serial.o -COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o ifdef CONFIG_CMD_USB COBJS-y += usb.o COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o -- cgit From 55195773eacefb22dd483a3c560ea30a14263ce1 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 29 Aug 2008 01:18:01 +0200 Subject: miiphybb: move to drivers/net/phy Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index 3e4829f475..ff2e6c6fd9 100644 --- a/common/Makefile +++ b/common/Makefile @@ -133,7 +133,6 @@ COBJS-$(CONFIG_LCD) += lcd.o COBJS-y += lists.o COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-y += memsize.o -COBJS-$(CONFIG_BITBANGMII) += miiphybb.o COBJS-y += miiphyutil.o COBJS-y += s_record.o COBJS-y += serial.o -- cgit From bbf52df9aa94ffb115b8b1ebeb00d01374bb0a1d Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 29 Aug 2008 01:18:11 +0200 Subject: crc16: move to lib_generic Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index ff2e6c6fd9..0c8ef5bb42 100644 --- a/common/Makefile +++ b/common/Makefile @@ -141,7 +141,6 @@ COBJS-y += usb.o COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o endif COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o -COBJS-y += crc16.o COBJS-y += xyzModem.o COBJS-y += cmd_mac.o COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o -- cgit From 81789c39db3f0f6b621df8c0ec66014d701f368e Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 29 Aug 2008 21:53:37 +0200 Subject: autoscript: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index 0c8ef5bb42..918b90856b 100644 --- a/common/Makefile +++ b/common/Makefile @@ -31,7 +31,7 @@ COBJS-y += main.o COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o COBJS-y += circbuf.o COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -COBJS-y += cmd_autoscript.o +COBJS-$(CONFIG_AUTOSCRIPT)$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o COBJS-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o @@ -148,6 +148,7 @@ COBJS-$(CONFIG_MP) += cmd_mp.o COBJS-$(CONFIG_CMD_SF) += cmd_sf.o COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o +COBJS-y += $(COBJS-yy) COBJS := $(COBJS-y) SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) -- cgit From ba7b5b2348b684cf8ec424b2e38e267dc1cfd2fb Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 29 Aug 2008 21:53:56 +0200 Subject: miiphyutil: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index 918b90856b..6ba20c0254 100644 --- a/common/Makefile +++ b/common/Makefile @@ -84,6 +84,7 @@ COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o COBJS-y += cmd_mem.o +COBJS-$(CONFIG_MII)$(CONFIG_CMD_MII) += miiphyutil.o COBJS-$(CONFIG_CMD_MII) += cmd_mii.o COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o @@ -133,7 +134,6 @@ COBJS-$(CONFIG_LCD) += lcd.o COBJS-y += lists.o COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-y += memsize.o -COBJS-y += miiphyutil.o COBJS-y += s_record.o COBJS-y += serial.o ifdef CONFIG_CMD_USB -- cgit From 578118bdf122877ae769776be002255be447b4fa Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 29 Aug 2008 21:53:57 +0200 Subject: common/Makefile: order by functionality Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 70 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 33 deletions(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index 6ba20c0254..6365faeefe 100644 --- a/common/Makefile +++ b/common/Makefile @@ -27,15 +27,40 @@ LIB = $(obj)libcommon.a AOBJS = +# core COBJS-y += main.o -COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o COBJS-y += circbuf.o +COBJS-y += console.o +COBJS-y += command.o +COBJS-y += devices.o +COBJS-y += dlmalloc.o +COBJS-y += exports.o +COBJS-y += hush.o +COBJS-y += image.o +COBJS-y += lists.o +COBJS-y += memsize.o +COBJS-y += s_record.o +COBJS-y += serial.o +COBJS-y += xyzModem.o + +# environment +COBJS-y += environment.o +COBJS-y += env_common.o +COBJS-y += env_dataflash.o +COBJS-y += env_eeprom.o +COBJS-y += env_flash.o +COBJS-y += env_nand.o +COBJS-y += env_nvram.o +COBJS-y += env_onenand.o +COBJS-y += env_sf.o +COBJS-y += env_nowhere.o + +# command COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o COBJS-$(CONFIG_AUTOSCRIPT)$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o -COBJS-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o +COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o -COBJS-y += image.o COBJS-y += cmd_boot.o COBJS-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o COBJS-y += cmd_bootm.o @@ -83,11 +108,14 @@ COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o +COBJS-y += cmd_mac.o COBJS-y += cmd_mem.o +COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o COBJS-$(CONFIG_MII)$(CONFIG_CMD_MII) += miiphyutil.o COBJS-$(CONFIG_CMD_MII) += cmd_mii.o COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o +COBJS-$(CONFIG_MP) += cmd_mp.o COBJS-y += cmd_nand.o COBJS-$(CONFIG_CMD_NET) += cmd_net.o COBJS-y += cmd_nvedit.o @@ -101,51 +129,27 @@ COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o COBJS-$(CONFIG_CMD_SATA) += cmd_sata.o +COBJS-$(CONFIG_CMD_SF) += cmd_sf.o COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o COBJS-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o COBJS-$(CONFIG_CMD_STRINGS) += cmd_strings.o COBJS-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o COBJS-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o -COBJS-$(CONFIG_CMD_USB) += cmd_usb.o +ifdef CONFIG_CMD_USB +COBJS-y += cmd_usb.o +COBJS-y += usb.o +COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o +endif COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o COBJS-y += cmd_vfd.o -COBJS-y += command.o -COBJS-y += console.o -COBJS-y += devices.o -COBJS-y += dlmalloc.o COBJS-$(CONFIG_CMD_DOC) += docecc.o -COBJS-y += environment.o -COBJS-y += env_common.o -COBJS-y += env_nand.o -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 += hush.o COBJS-y += kgdb.o COBJS-$(CONFIG_LCD) += lcd.o -COBJS-y += lists.o COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o -COBJS-y += memsize.o -COBJS-y += s_record.o -COBJS-y += serial.o -ifdef CONFIG_CMD_USB -COBJS-y += usb.o -COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o -endif COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o -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-$(CONFIG_DDR_SPD) += ddr_spd.o COBJS-y += $(COBJS-yy) -- cgit From c1de7a6daf9c657484e1c6d433f01fccd49a7f48 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sun, 31 Aug 2008 04:24:55 +0200 Subject: devices: merge to list_head Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index 6365faeefe..0fe9c8b42f 100644 --- a/common/Makefile +++ b/common/Makefile @@ -37,7 +37,6 @@ COBJS-y += dlmalloc.o COBJS-y += exports.o COBJS-y += hush.o COBJS-y += image.o -COBJS-y += lists.o COBJS-y += memsize.o COBJS-y += s_record.o COBJS-y += serial.o -- cgit