* [U-Boot-Users] [PATCH 0/9] First wave of config changes
@ 2007-09-25 18:26 Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 1/9] Build: split COBJS value into multiple lines Grant Likely
` (9 more replies)
0 siblings, 10 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:26 UTC (permalink / raw)
To: u-boot
Here's my first set of config changes. It allows the Makefiles to
conditionally compile *.o files based on the board configuration.
Only CONFIG_* macros may be used in the build system. Future patches
will rename many of the CFG_ macros to something prefixed with CONFIG_
I've heavily build-tested these changes for PPC, MIPS and ARM targets
using MAKEALL. The build results in binaries of identical size.
I've also pushed these changes to the 'kconfig-for-1.3.1' branch
of the u-boot-mpc5xxx.git repository.
Please review and comment.
Thanks,
g.
--
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 1/9] Build: split COBJS value into multiple lines
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
@ 2007-09-25 18:26 ` Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 2/9] Group network drivers in drivers/Makefile Grant Likely
` (8 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:26 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
This change is in preparation for condtitionial compile support in the
build system. By spliting them all into seperate lines now, subsequent
patches that change 'COBJS-y += ' into 'COBJS-$(CONFIG_<blah>) += ' will
be less invasive and easier to review
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
common/Makefile | 120 +++++++++++++++++++++++++++++++++++++---------
disk/Makefile | 7 ++-
drivers/Makefile | 114 +++++++++++++++++++++++++++++++++-----------
drivers/nand/Makefile | 10 +++-
drivers/sk98lin/Makefile | 26 ++++++++--
dtt/Makefile | 7 ++-
fs/jffs2/Makefile | 12 +++--
lib_generic/Makefile | 21 ++++++--
libfdt/Makefile | 4 +-
net/Makefile | 11 +++-
rtc/Makefile | 30 +++++++++---
11 files changed, 282 insertions(+), 80 deletions(-)
diff --git a/common/Makefile b/common/Makefile
index ef7d097..7e500a0 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -27,31 +27,103 @@ LIB = $(obj)libcommon.a
AOBJS =
-COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_autoscript.o \
- cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
- cmd_cache.o cmd_console.o \
- cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
- cmd_eeprom.o cmd_elf.o cmd_ext2.o \
- cmd_fat.o cmd_fdc.o cmd_fdt.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
- cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
- cmd_load.o cmd_log.o \
- cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \
- cmd_nand.o cmd_net.o cmd_nvedit.o \
- cmd_pci.o cmd_pcmcia.o cmd_portio.o \
- cmd_reginfo.o cmd_reiser.o cmd_sata.o cmd_scsi.o cmd_spi.o \
- cmd_universe.o cmd_usb.o cmd_vfd.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 \
- exports.o \
- fdt_support.o flash.o fpga.o ft_build.o \
- hush.o kgdb.o lcd.o lists.o lynxkdi.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 cmd_mac.o cmd_mfsl.o
+COBJS-y += main.o
+COBJS-y += ACEX1K.o
+COBJS-y += altera.o
+COBJS-y += bedbug.o
+COBJS-y += circbuf.o
+COBJS-y += cmd_autoscript.o
+COBJS-y += cmd_bdinfo.o
+COBJS-y += cmd_bedbug.o
+COBJS-y += cmd_bmp.o
+COBJS-y += cmd_boot.o
+COBJS-y += cmd_bootm.o
+COBJS-y += cmd_cache.o
+COBJS-y += cmd_console.o
+COBJS-y += cmd_date.o
+COBJS-y += cmd_dcr.o
+COBJS-y += cmd_diag.o
+COBJS-y += cmd_display.o
+COBJS-y += cmd_doc.o
+COBJS-y += cmd_dtt.o
+COBJS-y += cmd_eeprom.o
+COBJS-y += cmd_elf.o
+COBJS-y += cmd_ext2.o
+COBJS-y += cmd_fat.o
+COBJS-y += cmd_fdc.o
+COBJS-y += cmd_fdt.o
+COBJS-y += cmd_fdos.o
+COBJS-y += cmd_flash.o
+COBJS-y += cmd_fpga.o
+COBJS-y += cmd_i2c.o
+COBJS-y += cmd_ide.o
+COBJS-y += cmd_immap.o
+COBJS-y += cmd_itest.o
+COBJS-y += cmd_jffs2.o
+COBJS-y += cmd_load.o
+COBJS-y += cmd_log.o
+COBJS-y += cmd_mem.o
+COBJS-y += cmd_mii.o
+COBJS-y += cmd_misc.o
+COBJS-y += cmd_mmc.o
+COBJS-y += cmd_nand.o
+COBJS-y += cmd_net.o
+COBJS-y += cmd_nvedit.o
+COBJS-y += cmd_pci.o
+COBJS-y += cmd_pcmcia.o
+COBJS-y += cmd_portio.o
+COBJS-y += cmd_reginfo.o
+COBJS-y += cmd_reiser.o
+COBJS-y += cmd_sata.o
+COBJS-y += cmd_scsi.o
+COBJS-y += cmd_spi.o
+COBJS-y += cmd_universe.o
+COBJS-y += cmd_usb.o
+COBJS-y += cmd_vfd.o
+COBJS-y += command.o
+COBJS-y += console.o
+COBJS-y += cyclon2.o
+COBJS-y += devices.o
+COBJS-y += dlmalloc.o
+COBJS-y += 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_nvram.o
+COBJS-y += env_nowhere.o
+COBJS-y += exports.o
+COBJS-y += fdt_support.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
+COBJS-y += lists.o
+COBJS-y += lynxkdi.o
+COBJS-y += memsize.o
+COBJS-y += miiphybb.o
+COBJS-y += miiphyutil.o
+COBJS-y += s_record.o
+COBJS-y += serial.o
+COBJS-y += soft_i2c.o
+COBJS-y += soft_spi.o
+COBJS-y += spartan2.o
+COBJS-y += spartan3.o
+COBJS-y += usb.o
+COBJS-y += usb_kbd.o
+COBJS-y += usb_storage.o
+COBJS-y += virtex2.o
+COBJS-y += xilinx.o
+COBJS-y += crc16.o
+COBJS-y += xyzModem.o
+COBJS-y += cmd_mac.o
+COBJS-y += cmd_mfsl.o
+COBJS := $(COBJS-y)
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
diff --git a/disk/Makefile b/disk/Makefile
index 1a929ce..f19d18d 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -27,8 +27,13 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libdisk.a
-COBJS = part.o part_mac.o part_dos.o part_iso.o part_amiga.o
+COBJS-y += part.o
+COBJS-y += part_mac.o
+COBJS-y += part_dos.o
+COBJS-y += part_iso.o
+COBJS-y += part_amiga.o
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/drivers/Makefile b/drivers/Makefile
index 6bf05cc..fed09ee 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -27,35 +27,93 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libdrivers.a
-COBJS = 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o atmel_usart.o \
- bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
- cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
- e1000.o eepro100.o enc28j60.o \
- i8042.o inca-ip_sw.o isp116x-hcd.o keyboard.o \
- lan91c96.o macb.o \
- natsemi.o ne2000.o netarm_eth.o netconsole.o \
- ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
- omap24xx_i2c.o pci.o pci_auto.o pci_indirect.o \
- pcnet.o plb2800_eth.o \
- ps2ser.o ps2mult.o pc_keyb.o \
- rtl8019.o rtl8139.o rtl8169.o \
- s3c4510b_eth.o s3c4510b_uart.o \
- sed13806.o sed156x.o \
- serial.o serial_max3100.o \
- serial_pl010.o serial_pl011.o serial_xuartlite.o \
- sil680.o sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
- status_led.o sym53c8xx.o systemace.o ahci.o \
- ti_pci1410a.o tigon3.o tsec.o \
- tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
- usb_ohci.o \
- usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
- usbtty.o \
- videomodes.o w83c553f.o \
- ks8695eth.o \
- pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
- rpx_pcmcia.o \
- fsl_i2c.o fsl_pci_init.o ati_radeon_fb.o
+COBJS-y += 3c589.o
+COBJS-y += 5701rls.o
+COBJS-y += ali512x.o
+COBJS-y += at45.o
+COBJS-y += ata_piix.o
+COBJS-y += atmel_usart.o
+COBJS-y += bcm570x.o
+COBJS-y += bcm570x_autoneg.o
+COBJS-y += cfb_console.o
+COBJS-y += cfi_flash.o
+COBJS-y += cs8900.o
+COBJS-y += ct69000.o
+COBJS-y += dataflash.o
+COBJS-y += dc2114x.o
+COBJS-y += dm9000x.o
+COBJS-y += e1000.o
+COBJS-y += eepro100.o
+COBJS-y += enc28j60.o
+COBJS-y += i8042.o
+COBJS-y += inca-ip_sw.o
+COBJS-y += isp116x-hcd.o
+COBJS-y += keyboard.o
+COBJS-y += lan91c96.o
+COBJS-y += macb.o
+COBJS-y += natsemi.o
+COBJS-y += ne2000.o
+COBJS-y += netarm_eth.o
+COBJS-y += netconsole.o
+COBJS-y += ns16550.o
+COBJS-y += ns8382x.o
+COBJS-y += ns87308.o
+COBJS-y += ns7520_eth.o
+COBJS-y += omap1510_i2c.o
+COBJS-y += omap24xx_i2c.o
+COBJS-y += pci.o
+COBJS-y += pci_auto.o
+COBJS-y += pci_indirect.o
+COBJS-y += pcnet.o
+COBJS-y += plb2800_eth.o
+COBJS-y += ps2ser.o
+COBJS-y += ps2mult.o
+COBJS-y += pc_keyb.o
+COBJS-y += rtl8019.o
+COBJS-y += rtl8139.o
+COBJS-y += rtl8169.o
+COBJS-y += s3c4510b_eth.o
+COBJS-y += s3c4510b_uart.o
+COBJS-y += sed13806.o
+COBJS-y += sed156x.o
+COBJS-y += serial.o
+COBJS-y += serial_max3100.o
+COBJS-y += serial_pl010.o
+COBJS-y += serial_pl011.o
+COBJS-y += serial_xuartlite.o
+COBJS-y += sil680.o
+COBJS-y += sl811_usb.o
+COBJS-y += sm501.o
+COBJS-y += smc91111.o
+COBJS-y += smiLynxEM.o
+COBJS-y += status_led.o
+COBJS-y += sym53c8xx.o
+COBJS-y += systemace.o
+COBJS-y += ahci.o
+COBJS-y += ti_pci1410a.o
+COBJS-y += tigon3.o
+COBJS-y += tsec.o
+COBJS-y += tsi108_eth.o
+COBJS-y += tsi108_i2c.o
+COBJS-y += tsi108_pci.o
+COBJS-y += usb_ohci.o
+COBJS-y += usbdcore.o
+COBJS-y += usbdcore_ep0.o
+COBJS-y += usbdcore_mpc8xx.o
+COBJS-y += usbdcore_omap1510.o
+COBJS-y += usbtty.o
+COBJS-y += videomodes.o
+COBJS-y += w83c553f.o
+COBJS-y += ks8695eth.o
+COBJS-y += pxa_pcmcia.o
+COBJS-y += mpc8xx_pcmcia.o
+COBJS-y += tqm8xx_pcmcia.o
+COBJS-y += rpx_pcmcia.o
+COBJS-y += fsl_i2c.o
+COBJS-y += fsl_pci_init.o
+COBJS-y += ati_radeon_fb.o
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/drivers/nand/Makefile b/drivers/nand/Makefile
index fb0185b..42864f9 100644
--- a/drivers/nand/Makefile
+++ b/drivers/nand/Makefile
@@ -25,8 +25,14 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libnand.a
-COBJS := nand.o nand_base.o nand_ids.o nand_ecc.o nand_bbt.o nand_util.o
-
+COBJS-y += nand.o
+COBJS-y += nand_base.o
+COBJS-y += nand_ids.o
+COBJS-y += nand_ecc.o
+COBJS-y += nand_bbt.o
+COBJS-y += nand_util.o
+
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/drivers/sk98lin/Makefile b/drivers/sk98lin/Makefile
index 7e50b1d..a7d4a3b 100644
--- a/drivers/sk98lin/Makefile
+++ b/drivers/sk98lin/Makefile
@@ -29,12 +29,26 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libsk98lin.a
-COBJS := skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \
- ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o skvpd.o \
- skxmac2.o skcsum.o #skproc.o
-
-COBJS += uboot_skb.o uboot_drv.o
-
+COBJS-y += skge.o
+COBJS-y += skaddr.o
+COBJS-y += skgehwt.o
+COBJS-y += skgeinit.o
+COBJS-y += skgepnmi.o
+COBJS-y += skgesirq.o
+COBJS-y += ski2c.o
+COBJS-y += sklm80.o
+COBJS-y += skqueue.o
+COBJS-y += skrlmt.o
+COBJS-y += sktimer.o
+COBJS-y += skvpd.o
+COBJS-y += skxmac2.o
+COBJS-y += skcsum.o
+#COBJS-y += skproc.o
+
+COBJS-y += uboot_skb.o
+COBJS-y += uboot_drv.o
+
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/dtt/Makefile b/dtt/Makefile
index c6a670a..72e5c88 100644
--- a/dtt/Makefile
+++ b/dtt/Makefile
@@ -30,8 +30,13 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libdtt.a
-COBJS = lm75.o ds1621.o adm1021.o lm81.o ds1775.o
+COBJS-y += lm75.o
+COBJS-y += ds1621.o
+COBJS-y += adm1021.o
+COBJS-y += lm81.o
+COBJS-y += ds1775.o
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index c1357d0..a071af1 100644
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -26,9 +26,15 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libjffs2.a
AOBJS =
-COBJS = jffs2_1pass.o compr_rtime.o compr_rubin.o compr_zlib.o mini_inflate.o
-COBJS += compr_lzo.o compr_lzari.o
-
+COBJS-y += jffs2_1pass.o
+COBJS-y += compr_rtime.o
+COBJS-y += compr_rubin.o
+COBJS-y += compr_zlib.o
+COBJS-y += mini_inflate.o
+COBJS-y += compr_lzo.o
+COBJS-y += compr_lzari.o
+
+COBJS := $(COBJS-y)
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index bf37752..9713353 100644
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -25,11 +25,22 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libgeneric.a
-COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \
- bzlib_randtable.o bzlib_huffman.o \
- crc32.o ctype.o display_options.o div64.o ldiv.o sha1.o \
- string.o vsprintf.o zlib.o
-
+COBJS-y += bzlib.o
+COBJS-y += bzlib_crctable.o
+COBJS-y += bzlib_decompress.o
+COBJS-y += bzlib_randtable.o
+COBJS-y += bzlib_huffman.o
+COBJS-y += crc32.o
+COBJS-y += ctype.o
+COBJS-y += display_options.o
+COBJS-y += div64.o
+COBJS-y += ldiv.o
+COBJS-y += sha1.o
+COBJS-y += string.o
+COBJS-y += vsprintf.o
+COBJS-y += zlib.o
+
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/libfdt/Makefile b/libfdt/Makefile
index dc41137..126fa2c 100644
--- a/libfdt/Makefile
+++ b/libfdt/Makefile
@@ -27,9 +27,9 @@ LIB = $(obj)libfdt.a
SOBJS =
-COBJS = fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o
-
+COBJS-y += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o
+COBJS := $(COBJS-y)
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/net/Makefile b/net/Makefile
index d18460c..0eee330 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -27,8 +27,15 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libnet.a
-COBJS = net.o tftp.o bootp.o rarp.o eth.o nfs.o sntp.o
-
+COBJS-y += net.o
+COBJS-y += tftp.o
+COBJS-y += bootp.o
+COBJS-y += rarp.o
+COBJS-y += eth.o
+COBJS-y += nfs.o
+COBJS-y += sntp.o
+
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/rtc/Makefile b/rtc/Makefile
index 2e6f3bd..4a22b0d 100644
--- a/rtc/Makefile
+++ b/rtc/Makefile
@@ -27,13 +27,31 @@ include $(TOPDIR)/config.mk
LIB = $(obj)librtc.a
-COBJS = date.o \
- bf5xx_rtc.o ds12887.o ds1302.o ds1306.o ds1307.o \
- ds1337.o ds1374.o ds1556.o ds164x.o ds174x.o ds3231.o \
- m41t11.o max6900.o m48t35ax.o mc146818.o mk48t59.o \
- mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o rs5c372.o \
- mcfrtc.o
+COBJS-y += date.o
+COBJS-y += bf5xx_rtc.o
+COBJS-y += ds12887.o
+COBJS-y += ds1302.o
+COBJS-y += ds1306.o
+COBJS-y += ds1307.o
+COBJS-y += ds1337.o
+COBJS-y += ds1374.o
+COBJS-y += ds1556.o
+COBJS-y += ds164x.o
+COBJS-y += ds174x.o
+COBJS-y += ds3231.o
+COBJS-y += m41t11.o
+COBJS-y += max6900.o
+COBJS-y += m48t35ax.o
+COBJS-y += mc146818.o
+COBJS-y += mk48t59.o
+COBJS-y += mpc5xxx.o
+COBJS-y += mpc8xx.o
+COBJS-y += pcf8563.o
+COBJS-y += s3c24x0_rtc.o
+COBJS-y += rs5c372.o
+COBJS-y += mcfrtc.o
+COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 2/9] Group network drivers in drivers/Makefile
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 1/9] Build: split COBJS value into multiple lines Grant Likely
@ 2007-09-25 18:26 ` Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 3/9] Group console " Grant Likely
` (7 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:26 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
drivers/Makefile | 60 ++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index fed09ee..58cd649 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -27,52 +27,28 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libdrivers.a
-COBJS-y += 3c589.o
-COBJS-y += 5701rls.o
COBJS-y += ali512x.o
COBJS-y += at45.o
COBJS-y += ata_piix.o
COBJS-y += atmel_usart.o
-COBJS-y += bcm570x.o
-COBJS-y += bcm570x_autoneg.o
COBJS-y += cfb_console.o
COBJS-y += cfi_flash.o
-COBJS-y += cs8900.o
COBJS-y += ct69000.o
COBJS-y += dataflash.o
-COBJS-y += dc2114x.o
-COBJS-y += dm9000x.o
-COBJS-y += e1000.o
-COBJS-y += eepro100.o
-COBJS-y += enc28j60.o
COBJS-y += i8042.o
-COBJS-y += inca-ip_sw.o
COBJS-y += isp116x-hcd.o
COBJS-y += keyboard.o
-COBJS-y += lan91c96.o
-COBJS-y += macb.o
-COBJS-y += natsemi.o
-COBJS-y += ne2000.o
-COBJS-y += netarm_eth.o
COBJS-y += netconsole.o
COBJS-y += ns16550.o
-COBJS-y += ns8382x.o
COBJS-y += ns87308.o
-COBJS-y += ns7520_eth.o
COBJS-y += omap1510_i2c.o
COBJS-y += omap24xx_i2c.o
COBJS-y += pci.o
COBJS-y += pci_auto.o
COBJS-y += pci_indirect.o
-COBJS-y += pcnet.o
-COBJS-y += plb2800_eth.o
COBJS-y += ps2ser.o
COBJS-y += ps2mult.o
COBJS-y += pc_keyb.o
-COBJS-y += rtl8019.o
-COBJS-y += rtl8139.o
-COBJS-y += rtl8169.o
-COBJS-y += s3c4510b_eth.o
COBJS-y += s3c4510b_uart.o
COBJS-y += sed13806.o
COBJS-y += sed156x.o
@@ -84,16 +60,12 @@ COBJS-y += serial_xuartlite.o
COBJS-y += sil680.o
COBJS-y += sl811_usb.o
COBJS-y += sm501.o
-COBJS-y += smc91111.o
COBJS-y += smiLynxEM.o
COBJS-y += status_led.o
COBJS-y += sym53c8xx.o
COBJS-y += systemace.o
COBJS-y += ahci.o
COBJS-y += ti_pci1410a.o
-COBJS-y += tigon3.o
-COBJS-y += tsec.o
-COBJS-y += tsi108_eth.o
COBJS-y += tsi108_i2c.o
COBJS-y += tsi108_pci.o
COBJS-y += usb_ohci.o
@@ -104,7 +76,6 @@ COBJS-y += usbdcore_omap1510.o
COBJS-y += usbtty.o
COBJS-y += videomodes.o
COBJS-y += w83c553f.o
-COBJS-y += ks8695eth.o
COBJS-y += pxa_pcmcia.o
COBJS-y += mpc8xx_pcmcia.o
COBJS-y += tqm8xx_pcmcia.o
@@ -113,6 +84,37 @@ COBJS-y += fsl_i2c.o
COBJS-y += fsl_pci_init.o
COBJS-y += ati_radeon_fb.o
+#
+# Network Drivers
+#
+COBJS-y += 3c589.o
+COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o
+COBJS-y += cs8900.o
+COBJS-y += dc2114x.o
+COBJS-y += dm9000x.o
+COBJS-y += e1000.o
+COBJS-y += eepro100.o
+COBJS-y += enc28j60.o
+COBJS-y += inca-ip_sw.o
+COBJS-y += ks8695eth.o
+COBJS-y += lan91c96.o
+COBJS-y += macb.o
+COBJS-y += natsemi.o
+COBJS-y += ne2000.o
+COBJS-y += netarm_eth.o
+COBJS-y += ns7520_eth.o
+COBJS-y += ns8382x.o
+COBJS-y += pcnet.o
+COBJS-y += plb2800_eth.o
+COBJS-y += rtl8019.o
+COBJS-y += rtl8139.o
+COBJS-y += rtl8169.o
+COBJS-y += s3c4510b_eth.o
+COBJS-y += smc91111.o
+COBJS-y += tigon3.o
+COBJS-y += tsec.o
+COBJS-y += tsi108_eth.o
+
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 3/9] Group console drivers in drivers/Makefile
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 1/9] Build: split COBJS value into multiple lines Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 2/9] Group network drivers in drivers/Makefile Grant Likely
@ 2007-09-25 18:26 ` Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 4/9] Group i2c " Grant Likely
` (6 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:26 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
drivers/Makefile | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 58cd649..35d3fd2 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -30,37 +30,17 @@ LIB = $(obj)libdrivers.a
COBJS-y += ali512x.o
COBJS-y += at45.o
COBJS-y += ata_piix.o
-COBJS-y += atmel_usart.o
-COBJS-y += cfb_console.o
COBJS-y += cfi_flash.o
-COBJS-y += ct69000.o
COBJS-y += dataflash.o
-COBJS-y += i8042.o
COBJS-y += isp116x-hcd.o
-COBJS-y += keyboard.o
-COBJS-y += netconsole.o
-COBJS-y += ns16550.o
COBJS-y += ns87308.o
COBJS-y += omap1510_i2c.o
COBJS-y += omap24xx_i2c.o
COBJS-y += pci.o
COBJS-y += pci_auto.o
COBJS-y += pci_indirect.o
-COBJS-y += ps2ser.o
-COBJS-y += ps2mult.o
-COBJS-y += pc_keyb.o
-COBJS-y += s3c4510b_uart.o
-COBJS-y += sed13806.o
-COBJS-y += sed156x.o
-COBJS-y += serial.o
-COBJS-y += serial_max3100.o
-COBJS-y += serial_pl010.o
-COBJS-y += serial_pl011.o
-COBJS-y += serial_xuartlite.o
COBJS-y += sil680.o
COBJS-y += sl811_usb.o
-COBJS-y += sm501.o
-COBJS-y += smiLynxEM.o
COBJS-y += status_led.o
COBJS-y += sym53c8xx.o
COBJS-y += systemace.o
@@ -73,8 +53,6 @@ COBJS-y += usbdcore.o
COBJS-y += usbdcore_ep0.o
COBJS-y += usbdcore_mpc8xx.o
COBJS-y += usbdcore_omap1510.o
-COBJS-y += usbtty.o
-COBJS-y += videomodes.o
COBJS-y += w83c553f.o
COBJS-y += pxa_pcmcia.o
COBJS-y += mpc8xx_pcmcia.o
@@ -82,7 +60,33 @@ COBJS-y += tqm8xx_pcmcia.o
COBJS-y += rpx_pcmcia.o
COBJS-y += fsl_i2c.o
COBJS-y += fsl_pci_init.o
+
+#
+# Console Drivers
+#
COBJS-y += ati_radeon_fb.o
+COBJS-y += atmel_usart.o
+COBJS-y += cfb_console.o
+COBJS-y += ct69000.o
+COBJS-y += i8042.o
+COBJS-y += keyboard.o
+COBJS-y += netconsole.o
+COBJS-y += ns16550.o
+COBJS-y += ps2ser.o
+COBJS-y += ps2mult.o
+COBJS-y += pc_keyb.o
+COBJS-y += s3c4510b_uart.o
+COBJS-y += sed13806.o
+COBJS-y += sed156x.o
+COBJS-y += serial.o
+COBJS-y += serial_max3100.o
+COBJS-y += serial_pl010.o
+COBJS-y += serial_pl011.o
+COBJS-y += serial_xuartlite.o
+COBJS-y += sm501.o
+COBJS-y += smiLynxEM.o
+COBJS-y += usbtty.o
+COBJS-y += videomodes.o
#
# Network Drivers
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 4/9] Group i2c drivers in drivers/Makefile
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
` (2 preceding siblings ...)
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 3/9] Group console " Grant Likely
@ 2007-09-25 18:26 ` Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 5/9] Group USB " Grant Likely
` (5 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:26 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
drivers/Makefile | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 35d3fd2..00eba21 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,8 +34,6 @@ COBJS-y += cfi_flash.o
COBJS-y += dataflash.o
COBJS-y += isp116x-hcd.o
COBJS-y += ns87308.o
-COBJS-y += omap1510_i2c.o
-COBJS-y += omap24xx_i2c.o
COBJS-y += pci.o
COBJS-y += pci_auto.o
COBJS-y += pci_indirect.o
@@ -46,7 +44,6 @@ COBJS-y += sym53c8xx.o
COBJS-y += systemace.o
COBJS-y += ahci.o
COBJS-y += ti_pci1410a.o
-COBJS-y += tsi108_i2c.o
COBJS-y += tsi108_pci.o
COBJS-y += usb_ohci.o
COBJS-y += usbdcore.o
@@ -58,7 +55,6 @@ COBJS-y += pxa_pcmcia.o
COBJS-y += mpc8xx_pcmcia.o
COBJS-y += tqm8xx_pcmcia.o
COBJS-y += rpx_pcmcia.o
-COBJS-y += fsl_i2c.o
COBJS-y += fsl_pci_init.o
#
@@ -89,6 +85,14 @@ COBJS-y += usbtty.o
COBJS-y += videomodes.o
#
+# I2C Drivers
+#
+COBJS-y += omap1510_i2c.o
+COBJS-y += omap24xx_i2c.o
+COBJS-y += tsi108_i2c.o
+COBJS-y += fsl_i2c.o
+
+#
# Network Drivers
#
COBJS-y += 3c589.o
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 5/9] Group USB drivers in drivers/Makefile
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
` (3 preceding siblings ...)
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 4/9] Group i2c " Grant Likely
@ 2007-09-25 18:26 ` Grant Likely
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 6/9] Group block/flash " Grant Likely
` (4 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:26 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
drivers/Makefile | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 00eba21..821c851 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -32,24 +32,17 @@ COBJS-y += at45.o
COBJS-y += ata_piix.o
COBJS-y += cfi_flash.o
COBJS-y += dataflash.o
-COBJS-y += isp116x-hcd.o
COBJS-y += ns87308.o
COBJS-y += pci.o
COBJS-y += pci_auto.o
COBJS-y += pci_indirect.o
COBJS-y += sil680.o
-COBJS-y += sl811_usb.o
COBJS-y += status_led.o
COBJS-y += sym53c8xx.o
COBJS-y += systemace.o
COBJS-y += ahci.o
COBJS-y += ti_pci1410a.o
COBJS-y += tsi108_pci.o
-COBJS-y += usb_ohci.o
-COBJS-y += usbdcore.o
-COBJS-y += usbdcore_ep0.o
-COBJS-y += usbdcore_mpc8xx.o
-COBJS-y += usbdcore_omap1510.o
COBJS-y += w83c553f.o
COBJS-y += pxa_pcmcia.o
COBJS-y += mpc8xx_pcmcia.o
@@ -123,6 +116,17 @@ COBJS-y += tigon3.o
COBJS-y += tsec.o
COBJS-y += tsi108_eth.o
+#
+# USB Drivers
+#
+COBJS-y += isp116x-hcd.o
+COBJS-y += sl811_usb.o
+COBJS-y += usb_ohci.o
+COBJS-y += usbdcore.o
+COBJS-y += usbdcore_ep0.o
+COBJS-y += usbdcore_mpc8xx.o
+COBJS-y += usbdcore_omap1510.o
+
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 6/9] Group block/flash drivers in drivers/Makefile
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
` (4 preceding siblings ...)
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 5/9] Group USB " Grant Likely
@ 2007-09-25 18:27 ` Grant Likely
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 7/9] Group PCI " Grant Likely
` (3 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:27 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
drivers/Makefile | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 821c851..ca6f656 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -28,19 +28,11 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libdrivers.a
COBJS-y += ali512x.o
-COBJS-y += at45.o
-COBJS-y += ata_piix.o
-COBJS-y += cfi_flash.o
-COBJS-y += dataflash.o
COBJS-y += ns87308.o
COBJS-y += pci.o
COBJS-y += pci_auto.o
COBJS-y += pci_indirect.o
-COBJS-y += sil680.o
COBJS-y += status_led.o
-COBJS-y += sym53c8xx.o
-COBJS-y += systemace.o
-COBJS-y += ahci.o
COBJS-y += ti_pci1410a.o
COBJS-y += tsi108_pci.o
COBJS-y += w83c553f.o
@@ -51,6 +43,18 @@ COBJS-y += rpx_pcmcia.o
COBJS-y += fsl_pci_init.o
#
+# Block and Flash Drivers
+#
+COBJS-y += ahci.o
+COBJS-y += at45.o
+COBJS-y += ata_piix.o
+COBJS-y += cfi_flash.o
+COBJS-y += dataflash.o
+COBJS-y += sil680.o
+COBJS-y += sym53c8xx.o
+COBJS-y += systemace.o
+
+#
# Console Drivers
#
COBJS-y += ati_radeon_fb.o
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 7/9] Group PCI drivers in drivers/Makefile
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
` (5 preceding siblings ...)
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 6/9] Group block/flash " Grant Likely
@ 2007-09-25 18:27 ` Grant Likely
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files Grant Likely
` (2 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:27 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
drivers/Makefile | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index ca6f656..b9686bc 100755
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -27,21 +27,6 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libdrivers.a
-COBJS-y += ali512x.o
-COBJS-y += ns87308.o
-COBJS-y += pci.o
-COBJS-y += pci_auto.o
-COBJS-y += pci_indirect.o
-COBJS-y += status_led.o
-COBJS-y += ti_pci1410a.o
-COBJS-y += tsi108_pci.o
-COBJS-y += w83c553f.o
-COBJS-y += pxa_pcmcia.o
-COBJS-y += mpc8xx_pcmcia.o
-COBJS-y += tqm8xx_pcmcia.o
-COBJS-y += rpx_pcmcia.o
-COBJS-y += fsl_pci_init.o
-
#
# Block and Flash Drivers
#
@@ -121,6 +106,21 @@ COBJS-y += tsec.o
COBJS-y += tsi108_eth.o
#
+# PCI/PCMCIA device drivers
+#
+COBJS-y += fsl_pci_init.o
+COBJS-y += mpc8xx_pcmcia.o
+COBJS-y += pci.o
+COBJS-y += pci_auto.o
+COBJS-y += pci_indirect.o
+COBJS-y += pxa_pcmcia.o
+COBJS-y += rpx_pcmcia.o
+COBJS-y += ti_pci1410a.o
+COBJS-y += tsi108_pci.o
+COBJS-y += tqm8xx_pcmcia.o
+COBJS-y += w83c553f.o
+
+#
# USB Drivers
#
COBJS-y += isp116x-hcd.o
@@ -131,6 +131,13 @@ COBJS-y += usbdcore_ep0.o
COBJS-y += usbdcore_mpc8xx.o
COBJS-y += usbdcore_omap1510.o
+#
+# Miscellaneous Drivers
+#
+COBJS-y += ali512x.o
+COBJS-y += ns87308.o
+COBJS-y += status_led.o
+
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
` (6 preceding siblings ...)
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 7/9] Group PCI " Grant Likely
@ 2007-09-25 18:27 ` Grant Likely
2007-09-26 14:24 ` Shinya Kuribayashi
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 9/9] Conditionally compile common/cmd_*.c Grant Likely
2007-09-25 19:39 ` [U-Boot-Users] [PATCH 0/9] First wave of config changes Kim Phillips
9 siblings, 1 reply; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:27 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Use cpp and sed to postprocess config.h and import the defined values
into include/autoconf.mk. This is to support conditional compilation
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
Makefile | 7 ++++++-
config.mk | 3 +++
tools/scripts/define2mk.sed | 29 +++++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 8d500f5..6410f08 100644
--- a/Makefile
+++ b/Makefile
@@ -341,6 +341,10 @@ $(obj)System.map: $(obj)u-boot
grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(obj)System.map
+# Auto-generate the autoconf.mk file (which is included by all makefiles)
+$(OBJTREE)/include/autoconf.mk: $(obj)include/config.h
+ @${CPP} ${CFLAGS} -dM include/common.h | sed -n -f tools/scripts/define2mk.sed > $(OBJTREE)/include/autoconf.mk
+
#########################################################################
else
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
@@ -360,7 +364,8 @@ CHANGELOG:
unconfig:
@rm -f $(obj)include/config.h $(obj)include/config.mk \
- $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp
+ $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
+ $(obj)include/autoconf.mk
#========================================================================
# PowerPC
diff --git a/config.mk b/config.mk
index 582df32..7e477d6 100644
--- a/config.mk
+++ b/config.mk
@@ -91,6 +91,9 @@ ifdef BOARD
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules
endif
+# Load generated board configuration
+sinclude $(OBJTREE)/include/autoconf.mk
+
#########################################################################
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
diff --git a/tools/scripts/define2mk.sed b/tools/scripts/define2mk.sed
new file mode 100644
index 0000000..6464627
--- /dev/null
+++ b/tools/scripts/define2mk.sed
@@ -0,0 +1,29 @@
+#
+# Sed script to parse CPP macros and generate output usable by make
+#
+# It is expected that this script is fed the output of 'gpp -dM'
+# which preprocesses the common.h header files and outputs the final
+# list of CPP macros (and whitespace is sanitized)
+#
+
+# Only process values prefixed with #define CONFIG_
+/^#define CONFIG_[A-Za-z0-9_]\+/ {
+ # Strip the #define prefix
+ s/#define *//;
+ # Change to form CONFIG_*=VALUE
+ s/ \+/=/;
+ # Drop trailing spaces
+ s/ *$//;
+ # drop quotes around string values
+ s/="\(.*\)"$/=\1/;
+ # Concatenate string values
+ s/" *"//g;
+ # Wrap non-numeral values with quotes
+ s/=\(.*\?[^0-9].*\)$/=\"\1\"/;
+ # Change '1' and empty values to "y" (not perfect, but
+ # supports conditional compilation in the makefiles
+ s/=$/=y/;
+ s/=1$/=y/;
+ # print the line
+ p
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 9/9] Conditionally compile common/cmd_*.c
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
` (7 preceding siblings ...)
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files Grant Likely
@ 2007-09-25 18:27 ` Grant Likely
2007-09-25 19:39 ` [U-Boot-Users] [PATCH 0/9] First wave of config changes Kim Phillips
9 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-25 18:27 UTC (permalink / raw)
To: u-boot
From: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
common/Makefile | 84 ++++++++++++++++++++++++--------------------
common/cmd_bdinfo.c | 2 -
common/cmd_bedbug.c | 3 --
common/cmd_bmp.c | 4 --
common/cmd_console.c | 4 --
common/cmd_date.c | 4 --
common/cmd_dcr.c | 4 --
common/cmd_diag.c | 4 --
common/cmd_display.c | 4 --
common/cmd_doc.c | 5 ---
common/cmd_dtt.c | 4 --
common/cmd_elf.c | 4 --
common/cmd_ext2.c | 4 --
common/cmd_fat.c | 7 ----
common/cmd_fdos.c | 4 --
common/cmd_fdt.c | 5 ---
common/cmd_flash.c | 4 --
common/cmd_fpga.c | 3 --
common/cmd_i2c.c | 5 ---
common/cmd_ide.c | 4 --
common/cmd_immap.c | 5 +--
common/cmd_itest.c | 3 --
common/cmd_jffs2.c | 5 ---
common/cmd_log.c | 4 --
common/cmd_mfsl.c | 4 --
common/cmd_mii.c | 4 --
common/cmd_misc.c | 4 --
common/cmd_mmc.c | 5 ---
common/cmd_net.c | 4 --
common/cmd_pci.c | 9 -----
common/cmd_portio.c | 4 --
common/cmd_reginfo.c | 5 ---
common/cmd_reiser.c | 4 --
common/cmd_scsi.c | 4 --
common/cmd_spi.c | 4 --
common/cmd_universe.c | 4 --
common/cmd_usb.c | 10 -----
include/configs/sbc2410x.h | 1 -
include/configs/smdk2410.h | 1 -
39 files changed, 47 insertions(+), 199 deletions(-)
diff --git a/common/Makefile b/common/Makefile
index 7e500a0..cbd2253 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -33,52 +33,62 @@ COBJS-y += altera.o
COBJS-y += bedbug.o
COBJS-y += circbuf.o
COBJS-y += cmd_autoscript.o
-COBJS-y += cmd_bdinfo.o
-COBJS-y += cmd_bedbug.o
-COBJS-y += cmd_bmp.o
+COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
+COBJS-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o
+COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
COBJS-y += cmd_boot.o
COBJS-y += cmd_bootm.o
-COBJS-y += cmd_cache.o
-COBJS-y += cmd_console.o
-COBJS-y += cmd_date.o
-COBJS-y += cmd_dcr.o
-COBJS-y += cmd_diag.o
-COBJS-y += cmd_display.o
-COBJS-y += cmd_doc.o
-COBJS-y += cmd_dtt.o
+COBJS-$(CONFIG_CMD_CACHE) += cmd_cache.o
+COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o
+COBJS-$(CONFIG_CMD_DATE) += cmd_date.o
+ifdef CONFIG_4xx
+COBJS-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o
+endif
+ifdef CONFIG_POST
+COBJS-$(CONFIG_CMD_DIAG) += cmd_diag.o
+endif
+COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o
+COBJS-$(CONFIG_CMD_DOC) += cmd_doc.o
+COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.o
COBJS-y += cmd_eeprom.o
-COBJS-y += cmd_elf.o
-COBJS-y += cmd_ext2.o
-COBJS-y += cmd_fat.o
+COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
+COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
+COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
COBJS-y += cmd_fdc.o
-COBJS-y += cmd_fdt.o
-COBJS-y += cmd_fdos.o
-COBJS-y += cmd_flash.o
-COBJS-y += cmd_fpga.o
-COBJS-y += cmd_i2c.o
-COBJS-y += cmd_ide.o
-COBJS-y += cmd_immap.o
-COBJS-y += cmd_itest.o
-COBJS-y += cmd_jffs2.o
+COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o
+COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
+COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
+ifdef CONFIG_FPGA
+COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o
+endif
+COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o
+COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o
+COBJS-$(CONFIG_CMD_IMMAP) += cmd_immap.o
+COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o
+COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
COBJS-y += cmd_load.o
-COBJS-y += cmd_log.o
+COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
+COBJS-y += cmd_mac.o
COBJS-y += cmd_mem.o
-COBJS-y += cmd_mii.o
-COBJS-y += cmd_misc.o
-COBJS-y += cmd_mmc.o
+COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
+COBJS-$(CONFIG_CMD_MII) += cmd_mii.o
+COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
+COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
COBJS-y += cmd_nand.o
-COBJS-y += cmd_net.o
+COBJS-$(CONFIG_CMD_NET) += cmd_net.o
COBJS-y += cmd_nvedit.o
-COBJS-y += cmd_pci.o
+ifdef CONFIG_PCI
+COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o
+endif
COBJS-y += cmd_pcmcia.o
-COBJS-y += cmd_portio.o
-COBJS-y += cmd_reginfo.o
-COBJS-y += cmd_reiser.o
+COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o
+COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
+COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o
COBJS-y += cmd_sata.o
-COBJS-y += cmd_scsi.o
-COBJS-y += cmd_spi.o
-COBJS-y += cmd_universe.o
-COBJS-y += cmd_usb.o
+COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o
+COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o
+COBJS-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o
+COBJS-$(CONFIG_CMD_USB) += cmd_usb.o
COBJS-y += cmd_vfd.o
COBJS-y += command.o
COBJS-y += console.o
@@ -120,8 +130,6 @@ COBJS-y += virtex2.o
COBJS-y += xilinx.o
COBJS-y += crc16.o
COBJS-y += xyzModem.o
-COBJS-y += cmd_mac.o
-COBJS-y += cmd_mfsl.o
COBJS := $(COBJS-y)
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index ef15a00..d059983 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -30,7 +30,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_CMD_BDI)
static void print_num(const char *, ulong);
#ifndef CONFIG_ARM /* PowerPC and other */
@@ -350,4 +349,3 @@ U_BOOT_CMD(
"bdinfo - print Board Info structure\n",
NULL
);
-#endif
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 1c3547a..94f7e08 100644
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -13,8 +13,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_CMD_BEDBUG)
-
#ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
@@ -413,7 +411,6 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
"rdump - Show registers.\n", " - Show registers.\n");
/* ====================================================================== */
-#endif
/*
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 241aa83..907f9a2 100644
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -31,8 +31,6 @@
#include <asm/byteorder.h>
#include <malloc.h>
-#if defined(CONFIG_CMD_BMP)
-
static int bmp_info (ulong addr);
static int bmp_display (ulong addr, int x, int y);
@@ -187,5 +185,3 @@ static int bmp_display(ulong addr, int x, int y)
# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO
#endif
}
-
-#endif /* defined(CONFIG_CMD_BMP) */
diff --git a/common/cmd_console.c b/common/cmd_console.c
index 5e0f990..50ddb01 100644
--- a/common/cmd_console.c
+++ b/common/cmd_console.c
@@ -28,8 +28,6 @@
#include <command.h>
#include <devices.h>
-#if defined(CONFIG_CMD_CONSOLE)
-
extern void _do_coninfo (void);
int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
{
@@ -67,5 +65,3 @@ U_BOOT_CMD(
"coninfo - print console devices and information\n",
""
);
-
-#endif
diff --git a/common/cmd_date.c b/common/cmd_date.c
index 4a42534..7511598 100644
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -31,8 +31,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_CMD_DATE)
-
const char *weekdays[] = {
"Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
};
@@ -210,5 +208,3 @@ U_BOOT_CMD(
" - with numeric argument: set the system date & time\n"
" - with 'reset' argument: reset the RTC\n"
);
-
-#endif
diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index 12fa9db..a053343 100644
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -29,8 +29,6 @@
#include <config.h>
#include <command.h>
-#if defined(CONFIG_4xx) && defined(CONFIG_CMD_SETGETDCR)
-
unsigned long get_dcr (unsigned short);
unsigned long set_dcr (unsigned short, unsigned long);
@@ -245,5 +243,3 @@ U_BOOT_CMD(
"setidcr - Set a register value via indirect DCR addressing\n",
"adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
);
-
-#endif
diff --git a/common/cmd_diag.c b/common/cmd_diag.c
index cb99b77..82d5ad3 100644
--- a/common/cmd_diag.c
+++ b/common/cmd_diag.c
@@ -28,8 +28,6 @@
#include <command.h>
#include <post.h>
-#if defined(CONFIG_CMD_DIAG) && defined(CONFIG_POST)
-
int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
unsigned int i;
@@ -76,5 +74,3 @@ U_BOOT_CMD(
"diag run [test1 [test2]]\n"
" - run specified tests\n"
);
-
-#endif
diff --git a/common/cmd_display.c b/common/cmd_display.c
index d19f412..a29345c 100644
--- a/common/cmd_display.c
+++ b/common/cmd_display.c
@@ -24,8 +24,6 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_CMD_DISPLAY)
-
#undef DEBUG_DISP
#define DISP_SIZE 8
@@ -78,5 +76,3 @@ U_BOOT_CMD(
" - with <string> argument: display <string> on dot matrix display\n"
" - without arguments: clear dot matrix display\n"
);
-
-#endif
diff --git a/common/cmd_doc.c b/common/cmd_doc.c
index d6d3aff..3d717c0 100644
--- a/common/cmd_doc.c
+++ b/common/cmd_doc.c
@@ -11,9 +11,6 @@
#include <command.h>
#include <malloc.h>
#include <asm/io.h>
-
-#if defined(CONFIG_CMD_DOC)
-
#include <linux/mtd/nftl.h>
#include <linux/mtd/doc2000.h>
@@ -1607,5 +1604,3 @@ void doc_probe(unsigned long physadr)
puts ("No DiskOnChip found\n");
}
}
-
-#endif
diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c
index 8da95bf..2d8f2d4 100644
--- a/common/cmd_dtt.c
+++ b/common/cmd_dtt.c
@@ -25,8 +25,6 @@
#include <config.h>
#include <command.h>
-#if defined(CONFIG_CMD_DTT)
-
#include <dtt.h>
#include <i2c.h>
@@ -60,5 +58,3 @@ U_BOOT_CMD(
"dtt - Digital Thermometer and Themostat\n",
" - Read temperature from digital thermometer and thermostat.\n"
);
-
-#endif
diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 63a5593..2eb7453 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -23,8 +23,6 @@
DECLARE_GLOBAL_DATA_PTR;
#endif
-#if defined(CONFIG_CMD_ELF)
-
#ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
@@ -323,5 +321,3 @@ U_BOOT_CMD(
"bootvx - Boot vxWorks from an ELF image\n",
" [address] - load address of vxWorks ELF image.\n"
);
-
-#endif
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 8bd2b47..f569406 100644
--- a/common/cmd_ext2.c
+++ b/common/cmd_ext2.c
@@ -34,8 +34,6 @@
*/
#include <common.h>
#include <part.h>
-
-#if defined(CONFIG_CMD_EXT2)
#include <config.h>
#include <command.h>
#include <image.h>
@@ -259,5 +257,3 @@ U_BOOT_CMD(
" - load binary file 'filename' from 'dev' on 'interface'\n"
" to address 'addr' from ext2 filesystem\n"
);
-
-#endif
diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index 54f0f9f..9576cdf 100644
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -30,11 +30,6 @@
#include <net.h>
#include <ata.h>
#include <part.h>
-
-#if defined(CONFIG_CMD_FAT)
-
-#undef DEBUG
-
#include <fat.h>
@@ -323,5 +318,3 @@ void hexdump (int cnt, unsigned char *data)
}
}
#endif /* NOT_IMPLEMENTED_YET */
-
-#endif
diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index f9da98d..b3dbd19 100644
--- a/common/cmd_fdos.c
+++ b/common/cmd_fdos.c
@@ -31,8 +31,6 @@
#include <command.h>
#include <fdc.h>
-#if defined(CONFIG_CMD_FDOS)
-
/*-----------------------------------------------------------------------------
* do_fdosboot --
*-----------------------------------------------------------------------------
@@ -153,5 +151,3 @@ U_BOOT_CMD(
"fdosls - list files in a directory\n",
"[directory]\n"
);
-
-#endif
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 571b8f1..f18c583 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -28,9 +28,6 @@
#include <command.h>
#include <linux/ctype.h>
#include <linux/types.h>
-
-#ifdef CONFIG_OF_LIBFDT
-
#include <asm/global_data.h>
#include <fdt.h>
#include <libfdt.h>
@@ -692,5 +689,3 @@ U_BOOT_CMD(
" fdt print /cpus \"#address-cells\"\n"
" fdt set /cpus \"#address-cells\" \"[00 00 00 01]\"\n"
);
-
-#endif /* CONFIG_OF_LIBFDT */
diff --git a/common/cmd_flash.c b/common/cmd_flash.c
index 11c8857..f56443e 100644
--- a/common/cmd_flash.c
+++ b/common/cmd_flash.c
@@ -31,8 +31,6 @@
#include <dataflash.h>
#endif
-#if defined(CONFIG_CMD_FLASH)
-
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
#include <jffs2/jffs2.h>
@@ -731,5 +729,3 @@ U_BOOT_CMD(
#undef TMP_ERASE
#undef TMP_PROT_ON
#undef TMP_PROT_OFF
-
-#endif
diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index 3fc4fca..000406e 100644
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -43,8 +43,6 @@
#define PRINTF(fmt,args...)
#endif
-#if defined (CONFIG_FPGA) && defined(CONFIG_CMD_FPGA)
-
/* Local functions */
static void fpga_usage (cmd_tbl_t * cmdtp);
static int fpga_get_op (char *opstr);
@@ -321,4 +319,3 @@ U_BOOT_CMD (fpga, 6, 1, do_fpga,
"\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"
"\tloadmk\tLoad device generated with mkimage\n"
"\tdump\tLoad device to memory buffer\n");
-#endif
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index a684a58..10cab46 100644
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -86,9 +86,6 @@
#include <i2c.h>
#include <asm/byteorder.h>
-#if defined(CONFIG_CMD_I2C)
-
-
/* Display values from last command.
* Memory modify remembered values are different from display memory.
*/
@@ -1024,5 +1021,3 @@ U_BOOT_CMD(
" (valid chip values 50..57)\n"
);
#endif
-
-#endif
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index bb064ea..fccf666 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -72,8 +72,6 @@ DECLARE_GLOBAL_DATA_PTR;
# define SYNC /* nothing */
#endif
-#if defined(CONFIG_CMD_IDE)
-
#ifdef CONFIG_IDE_8xx_DIRECT
/* Timings for IDE Interface
*
@@ -2085,5 +2083,3 @@ U_BOOT_CMD(
"diskboot- boot from IDE device\n",
"loadAddr dev:part\n"
);
-
-#endif
diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index ae95758..d758269 100644
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -28,8 +28,7 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_CMD_IMMAP) && \
- (defined(CONFIG_8xx) || defined(CONFIG_8260))
+#if defined(CONFIG_8xx) || defined(CONFIG_8260)
#if defined(CONFIG_8xx)
#include <asm/8xx_immap.h>
@@ -41,9 +40,7 @@
#include <asm/iopin_8260.h>
#endif
-#if defined(CONFIG_8xx) || defined(CONFIG_8260)
DECLARE_GLOBAL_DATA_PTR;
-#endif
static void
unimplemented ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 8e20517..ce98872 100644
--- a/common/cmd_itest.c
+++ b/common/cmd_itest.c
@@ -32,8 +32,6 @@
#include <config.h>
#include <command.h>
-#if defined(CONFIG_CMD_ITEST)
-
#define EQ 0
#define NE 1
#define LT 2
@@ -197,4 +195,3 @@ U_BOOT_CMD(
"itest\t- return true/false on integer compare\n",
"[.b, .w, .l, .s] [*]value1 <op> [*]value2\n"
);
-#endif
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 513a226..efe9eb7 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -93,9 +93,6 @@
#include <jffs2/jffs2.h>
#include <linux/list.h>
#include <linux/ctype.h>
-
-#if defined(CONFIG_CMD_JFFS2)
-
#include <cramfs/cramfs_fs.h>
#if defined(CONFIG_CMD_NAND)
@@ -2191,5 +2188,3 @@ U_BOOT_CMD(
#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
/***************************************************/
-
-#endif
diff --git a/common/cmd_log.c b/common/cmd_log.c
index fba8bd8..e593dbe 100644
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -48,8 +48,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_LOGBUFFER)
-
/* Local prototypes */
static void logbuff_putc (const char c);
static void logbuff_puts (const char *s);
@@ -287,5 +285,3 @@ static int logbuff_printk(const char *line)
}
return i;
}
-
-#endif /* (CONFIG_LOGBUFFER) */
diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c
index 8d4c1a3..5ce3aae 100644
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -29,8 +29,6 @@
#include <common.h>
#include <config.h>
#include <command.h>
-
-#if defined(CONFIG_CMD_MFSL)
#include <asm/asm.h>
int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
@@ -413,5 +411,3 @@ U_BOOT_CMD (rspr, 3, 1, do_rspr,
" 0 - MSR - Machine status register\n"
" 1 - EAR - Exception address register\n"
" 2 - ESR - Exception status register\n");
-
-#endif
diff --git a/common/cmd_mii.c b/common/cmd_mii.c
index 72e11d5..b876841 100644
--- a/common/cmd_mii.c
+++ b/common/cmd_mii.c
@@ -27,8 +27,6 @@
#include <common.h>
#include <command.h>
-
-#if defined(CONFIG_CMD_MII)
#include <miiphy.h>
#ifdef CONFIG_TERSE_MII
@@ -594,5 +592,3 @@ U_BOOT_CMD(
);
#endif /* CONFIG_TERSE_MII */
-
-#endif
diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index c0c6b8f..126b538 100644
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -27,8 +27,6 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_CMD_MISC)
-
int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
ulong start = get_timer(0);
@@ -68,5 +66,3 @@ U_BOOT_CMD(
"N\n"
" - delay execution for N seconds (N is _decimal_ !!!)\n"
);
-
-#endif
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 069c6d0..25c9702 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -23,9 +23,6 @@
#include <common.h>
#include <command.h>
-
-#if defined(CONFIG_CMD_MMC)
-
#include <mmc.h>
int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -42,5 +39,3 @@ U_BOOT_CMD(
"mmcinit - init mmc card\n",
NULL
);
-
-#endif
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 0715fbc..21682c0 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -28,8 +28,6 @@
#include <command.h>
#include <net.h>
-#if defined(CONFIG_CMD_NET)
-
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
@@ -343,5 +341,3 @@ U_BOOT_CMD(
"[NTP server IP]\n"
);
#endif
-
-#endif
diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 8be6da9..82d9717 100644
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -30,16 +30,11 @@
*/
#include <common.h>
-
-#ifdef CONFIG_PCI
-
#include <command.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <pci.h>
-#if defined(CONFIG_CMD_PCI)
-
extern int cmd_get_data_size(char* arg, int default_size);
unsigned char ShortPCIListing = 1;
@@ -564,7 +559,3 @@ U_BOOT_CMD(
"pci write[.b, .w, .l] b.d.f address value\n"
" - write to CFG address\n"
);
-
-#endif
-
-#endif /* CONFIG_PCI */
diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index bfe33e3..a06cac0 100644
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -30,8 +30,6 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_CMD_PORTIO)
-
extern int cmd_get_data_size (char *arg, int default_size);
/* Display values from last command.
@@ -165,5 +163,3 @@ U_BOOT_CMD(
"[.b, .w, .l] port\n"
" - read datum from IO port\n"
);
-
-#endif
diff --git a/common/cmd_reginfo.c b/common/cmd_reginfo.c
index 17e9cd9..bb6aa30 100644
--- a/common/cmd_reginfo.c
+++ b/common/cmd_reginfo.c
@@ -33,8 +33,6 @@
#include <mpc5xxx.h>
#endif
-#if defined(CONFIG_CMD_REGINFO)
-
int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
#if defined(CONFIG_8xx)
@@ -335,9 +333,6 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 0;
}
-#endif
-
-
/**************************************************/
#if ( defined(CONFIG_8xx) || defined(CONFIG_405GP) || \
diff --git a/common/cmd_reiser.c b/common/cmd_reiser.c
index 1ba3929..b7395d7 100644
--- a/common/cmd_reiser.c
+++ b/common/cmd_reiser.c
@@ -27,8 +27,6 @@
* Reiserfs support
*/
#include <common.h>
-
-#if defined(CONFIG_CMD_REISER)
#include <config.h>
#include <command.h>
#include <image.h>
@@ -239,5 +237,3 @@ U_BOOT_CMD(
" - load binary file 'filename' from 'dev' on 'interface'\n"
" to address 'addr' from dos filesystem\n"
);
-
-#endif
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index f563931..3e9fd8a 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -34,8 +34,6 @@
#include <image.h>
#include <pci.h>
-#if defined(CONFIG_CMD_SCSI)
-
#ifdef CONFIG_SCSI_SYM53C8XX
#define SCSI_VEND_ID 0x1000
#ifndef CONFIG_SCSI_DEV_ID
@@ -608,5 +606,3 @@ U_BOOT_CMD(
"scsiboot- boot from SCSI device\n",
"loadAddr dev:part\n"
);
-
-#endif
diff --git a/common/cmd_spi.c b/common/cmd_spi.c
index 3118d27..7604422 100644
--- a/common/cmd_spi.c
+++ b/common/cmd_spi.c
@@ -29,8 +29,6 @@
#include <command.h>
#include <spi.h>
-#if defined(CONFIG_CMD_SPI)
-
/*-----------------------------------------------------------------------
* Definitions
*/
@@ -139,5 +137,3 @@ U_BOOT_CMD(
"<bit_len> - Number of bits to send (base 10)\n"
"<dout> - Hexadecimal string that gets sent\n"
);
-
-#endif
diff --git a/common/cmd_universe.c b/common/cmd_universe.c
index 8bf0b1f..ea97782 100644
--- a/common/cmd_universe.c
+++ b/common/cmd_universe.c
@@ -28,8 +28,6 @@
#include <universe.h>
-#if defined(CONFIG_CMD_UNIVERSE)
-
#define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
#define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
@@ -386,5 +384,3 @@ U_BOOT_CMD(
" 02 -> D16 Data Width\n"
" 03 -> D32 Data Width\n"
);
-
-#endif
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 45e07f1..c6b17c2 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -29,9 +29,6 @@
#include <command.h>
#include <asm/byteorder.h>
#include <part.h>
-
-#if defined(CONFIG_CMD_USB)
-
#include <usb.h>
#ifdef CONFIG_USB_STORAGE
@@ -608,12 +605,6 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 1;
}
-
-#endif
-
-
-#if defined(CONFIG_CMD_USB)
-
#ifdef CONFIG_USB_STORAGE
U_BOOT_CMD(
usb, 5, 1, do_usb,
@@ -645,4 +636,3 @@ U_BOOT_CMD(
"usb info [dev] - show available USB devices\n"
);
#endif
-#endif
diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h
index b4a063a..9b05bd6 100644
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -103,7 +103,6 @@
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_ELF
#define CONFIG_CMD_PING
-#define CONFIG_CMD_REGINFO
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index ca404ff..18a036c 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -88,7 +88,6 @@
#include <config_cmd_default.h>
#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_DATE
#define CONFIG_CMD_ELF
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 0/9] First wave of config changes
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
` (8 preceding siblings ...)
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 9/9] Conditionally compile common/cmd_*.c Grant Likely
@ 2007-09-25 19:39 ` Kim Phillips
2007-09-25 19:47 ` Grant Likely
9 siblings, 1 reply; 15+ messages in thread
From: Kim Phillips @ 2007-09-25 19:39 UTC (permalink / raw)
To: u-boot
On Tue, 25 Sep 2007 12:26:29 -0600
Grant Likely <grant.likely@secretlab.ca> wrote:
> Here's my first set of config changes. It allows the Makefiles to
> conditionally compile *.o files based on the board configuration.
the makefile grouping patches are just begging to have their drivers
moved into their own subdirs (e.g. drivers/net, drivers/block, etc.).
> Only CONFIG_* macros may be used in the build system. Future patches
> will rename many of the CFG_ macros to something prefixed with CONFIG_
just to be clear - these CFG_ rename patches will go in 1.3.1?
Kim
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 0/9] First wave of config changes
2007-09-25 19:39 ` [U-Boot-Users] [PATCH 0/9] First wave of config changes Kim Phillips
@ 2007-09-25 19:47 ` Grant Likely
2007-09-25 21:21 ` Wolfgang Denk
0 siblings, 1 reply; 15+ messages in thread
From: Grant Likely @ 2007-09-25 19:47 UTC (permalink / raw)
To: u-boot
On 9/25/07, Kim Phillips <kim.phillips@freescale.com> wrote:
> On Tue, 25 Sep 2007 12:26:29 -0600
> Grant Likely <grant.likely@secretlab.ca> wrote:
>
> > Here's my first set of config changes. It allows the Makefiles to
> > conditionally compile *.o files based on the board configuration.
>
> the makefile grouping patches are just begging to have their drivers
> moved into their own subdirs (e.g. drivers/net, drivers/block, etc.).
:-D
I leave that as an exercise for someone else.
>
> > Only CONFIG_* macros may be used in the build system. Future patches
> > will rename many of the CFG_ macros to something prefixed with CONFIG_
>
> just to be clear - these CFG_ rename patches will go in 1.3.1?
I don't know, it depends on how well it goes in the next week.
However, the CFG_ changes will be script driven so it's not critical
to get them in before everything else. I don't need to do any extra
manual work if other patches go in also. I *do* want to get them in
at the start of the merge window simply because it means they'll get
more testing that way, but that's the only reason.
For clarity sake: it is the Makefile changes that I'm most worried
about causing merge conflicts. As long as they go in first, the rest
of my changes should be easy to merge/rebase.
Cheers,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 0/9] First wave of config changes
2007-09-25 19:47 ` Grant Likely
@ 2007-09-25 21:21 ` Wolfgang Denk
0 siblings, 0 replies; 15+ messages in thread
From: Wolfgang Denk @ 2007-09-25 21:21 UTC (permalink / raw)
To: u-boot
In message <fa686aa40709251247w72b03a5eo54d3d244075b48fb@mail.gmail.com> you wrote:
>
> However, the CFG_ changes will be script driven so it's not critical
> to get them in before everything else. I don't need to do any extra
> manual work if other patches go in also. I *do* want to get them in
> at the start of the merge window simply because it means they'll get
> more testing that way, but that's the only reason.
Actually it is my intention to pull this into -testing at least a
week *before* the merge window opens, to allow all others to rebase
their patches.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"If God had wanted us to use the metric system, Jesus would have had
10 apostles."
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files Grant Likely
@ 2007-09-26 14:24 ` Shinya Kuribayashi
2007-09-26 14:51 ` Grant Likely
0 siblings, 1 reply; 15+ messages in thread
From: Shinya Kuribayashi @ 2007-09-26 14:24 UTC (permalink / raw)
To: u-boot
Grant Likely wrote:
> diff --git a/tools/scripts/define2mk.sed b/tools/scripts/define2mk.sed
> new file mode 100644
> index 0000000..6464627
> --- /dev/null
> +++ b/tools/scripts/define2mk.sed
> @@ -0,0 +1,29 @@
> +#
> +# Sed script to parse CPP macros and generate output usable by make
> +#
> +# It is expected that this script is fed the output of 'gpp -dM'
'cpp -dM'
> +# which preprocesses the common.h header files and outputs the final
> +# list of CPP macros (and whitespace is sanitized)
> +#
> +
> +# Only process values prefixed with #define CONFIG_
> +/^#define CONFIG_[A-Za-z0-9_]\+/ {
> + # Strip the #define prefix
> + s/#define *//;
> + # Change to form CONFIG_*=VALUE
> + s/ \+/=/;
> + # Drop trailing spaces
> + s/ *$//;
> + # drop quotes around string values
> + s/="\(.*\)"$/=\1/;
> + # Concatenate string values
> + s/" *"//g;
> + # Wrap non-numeral values with quotes
> + s/=\(.*\?[^0-9].*\)$/=\"\1\"/;
> + # Change '1' and empty values to "y" (not perfect, but
> + # supports conditional compilation in the makefiles
> + s/=$/=y/;
> + s/=1$/=y/;
> + # print the line
> + p
> +}
It seems scripts works, but I feel like a little bit hard coded.
FWIW how Linux work around this sort of job? I have to check..
Anyway, I don't intend to object this patch. Please go ahead :-)
Thanks,
Shinya Kuribayashi
P.S.
The remaining patches are also Ok for me.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files
2007-09-26 14:24 ` Shinya Kuribayashi
@ 2007-09-26 14:51 ` Grant Likely
0 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2007-09-26 14:51 UTC (permalink / raw)
To: u-boot
On 9/26/07, Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> wrote:
> Grant Likely wrote:
> > diff --git a/tools/scripts/define2mk.sed b/tools/scripts/define2mk.sed
> > new file mode 100644
> > index 0000000..6464627
> > --- /dev/null
> > +++ b/tools/scripts/define2mk.sed
> > @@ -0,0 +1,29 @@
> > +#
> > +# Sed script to parse CPP macros and generate output usable by make
> > +#
> > +# It is expected that this script is fed the output of 'gpp -dM'
>
> 'cpp -dM'
Oops.
>
> It seems scripts works, but I feel like a little bit hard coded.
> FWIW how Linux work around this sort of job? I have to check..
> Anyway, I don't intend to object this patch. Please go ahead :-)
Yes, it is a little hard coded to only grab CONFIG_* macros. However,
this is only a temporary migration step. The goal is to remove the
CONFIG_* macros from the include/configs/*.h files entirely and use
defconfig files instead (which are input files for the Kconfig
system). At that point, this script will go away.
Cheers,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2007-09-26 14:51 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-25 18:26 [U-Boot-Users] [PATCH 0/9] First wave of config changes Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 1/9] Build: split COBJS value into multiple lines Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 2/9] Group network drivers in drivers/Makefile Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 3/9] Group console " Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 4/9] Group i2c " Grant Likely
2007-09-25 18:26 ` [U-Boot-Users] [PATCH 5/9] Group USB " Grant Likely
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 6/9] Group block/flash " Grant Likely
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 7/9] Group PCI " Grant Likely
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files Grant Likely
2007-09-26 14:24 ` Shinya Kuribayashi
2007-09-26 14:51 ` Grant Likely
2007-09-25 18:27 ` [U-Boot-Users] [PATCH 9/9] Conditionally compile common/cmd_*.c Grant Likely
2007-09-25 19:39 ` [U-Boot-Users] [PATCH 0/9] First wave of config changes Kim Phillips
2007-09-25 19:47 ` Grant Likely
2007-09-25 21:21 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.