Commit f0037c56b0d12cd46215124667b9f83d60ef9391

Authored by Grant Likely
1 parent 1b4aaffe4f

Build: split COBJS value into multiple lines

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>

Showing 11 changed files with 284 additions and 80 deletions Side-by-side Diff

... ... @@ -27,32 +27,105 @@
27 27  
28 28 AOBJS =
29 29  
30   -COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_autoscript.o \
31   - cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
32   - cmd_cache.o cmd_console.o \
33   - cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
34   - cmd_eeprom.o cmd_elf.o cmd_ext2.o \
35   - cmd_fat.o cmd_fdc.o cmd_fdt.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
36   - cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
37   - cmd_load.o cmd_log.o \
38   - cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \
39   - cmd_nand.o cmd_net.o cmd_nvedit.o \
40   - cmd_onenand.o \
41   - cmd_pci.o cmd_pcmcia.o cmd_portio.o \
42   - cmd_reginfo.o cmd_reiser.o cmd_sata.o cmd_scsi.o cmd_spi.o \
43   - cmd_universe.o cmd_usb.o cmd_vfd.o \
44   - command.o console.o cyclon2.o devices.o dlmalloc.o docecc.o \
45   - environment.o env_common.o \
46   - env_nand.o env_dataflash.o env_flash.o env_eeprom.o \
47   - env_onenand.o env_nvram.o env_nowhere.o \
48   - exports.o \
49   - fdt_support.o flash.o fpga.o ft_build.o \
50   - hush.o kgdb.o lcd.o lists.o lynxkdi.o \
51   - memsize.o miiphybb.o miiphyutil.o \
52   - s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
53   - usb.o usb_kbd.o usb_storage.o \
54   - virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o cmd_mfsl.o
  30 +COBJS-y += main.o
  31 +COBJS-y += ACEX1K.o
  32 +COBJS-y += altera.o
  33 +COBJS-y += bedbug.o
  34 +COBJS-y += circbuf.o
  35 +COBJS-y += cmd_autoscript.o
  36 +COBJS-y += cmd_bdinfo.o
  37 +COBJS-y += cmd_bedbug.o
  38 +COBJS-y += cmd_bmp.o
  39 +COBJS-y += cmd_boot.o
  40 +COBJS-y += cmd_bootm.o
  41 +COBJS-y += cmd_cache.o
  42 +COBJS-y += cmd_console.o
  43 +COBJS-y += cmd_date.o
  44 +COBJS-y += cmd_dcr.o
  45 +COBJS-y += cmd_diag.o
  46 +COBJS-y += cmd_display.o
  47 +COBJS-y += cmd_doc.o
  48 +COBJS-y += cmd_dtt.o
  49 +COBJS-y += cmd_eeprom.o
  50 +COBJS-y += cmd_elf.o
  51 +COBJS-y += cmd_ext2.o
  52 +COBJS-y += cmd_fat.o
  53 +COBJS-y += cmd_fdc.o
  54 +COBJS-y += cmd_fdt.o
  55 +COBJS-y += cmd_fdos.o
  56 +COBJS-y += cmd_flash.o
  57 +COBJS-y += cmd_fpga.o
  58 +COBJS-y += cmd_i2c.o
  59 +COBJS-y += cmd_ide.o
  60 +COBJS-y += cmd_immap.o
  61 +COBJS-y += cmd_itest.o
  62 +COBJS-y += cmd_jffs2.o
  63 +COBJS-y += cmd_load.o
  64 +COBJS-y += cmd_log.o
  65 +COBJS-y += cmd_mem.o
  66 +COBJS-y += cmd_mii.o
  67 +COBJS-y += cmd_misc.o
  68 +COBJS-y += cmd_mmc.o
  69 +COBJS-y += cmd_nand.o
  70 +COBJS-y += cmd_net.o
  71 +COBJS-y += cmd_nvedit.o
  72 +COBJS-y += cmd_onenand.o
  73 +COBJS-y += cmd_pci.o
  74 +COBJS-y += cmd_pcmcia.o
  75 +COBJS-y += cmd_portio.o
  76 +COBJS-y += cmd_reginfo.o
  77 +COBJS-y += cmd_reiser.o
  78 +COBJS-y += cmd_sata.o
  79 +COBJS-y += cmd_scsi.o
  80 +COBJS-y += cmd_spi.o
  81 +COBJS-y += cmd_universe.o
  82 +COBJS-y += cmd_usb.o
  83 +COBJS-y += cmd_vfd.o
  84 +COBJS-y += command.o
  85 +COBJS-y += console.o
  86 +COBJS-y += cyclon2.o
  87 +COBJS-y += devices.o
  88 +COBJS-y += dlmalloc.o
  89 +COBJS-y += docecc.o
  90 +COBJS-y += environment.o
  91 +COBJS-y += env_common.o
  92 +COBJS-y += env_nand.o
  93 +COBJS-y += env_dataflash.o
  94 +COBJS-y += env_flash.o
  95 +COBJS-y += env_eeprom.o
  96 +COBJS-y += env_onenand.o
  97 +COBJS-y += env_nvram.o
  98 +COBJS-y += env_nowhere.o
  99 +COBJS-y += exports.o
  100 +COBJS-y += fdt_support.o
  101 +COBJS-y += flash.o
  102 +COBJS-y += fpga.o
  103 +COBJS-y += ft_build.o
  104 +COBJS-y += hush.o
  105 +COBJS-y += kgdb.o
  106 +COBJS-y += lcd.o
  107 +COBJS-y += lists.o
  108 +COBJS-y += lynxkdi.o
  109 +COBJS-y += memsize.o
  110 +COBJS-y += miiphybb.o
  111 +COBJS-y += miiphyutil.o
  112 +COBJS-y += s_record.o
  113 +COBJS-y += serial.o
  114 +COBJS-y += soft_i2c.o
  115 +COBJS-y += soft_spi.o
  116 +COBJS-y += spartan2.o
  117 +COBJS-y += spartan3.o
  118 +COBJS-y += usb.o
  119 +COBJS-y += usb_kbd.o
  120 +COBJS-y += usb_storage.o
  121 +COBJS-y += virtex2.o
  122 +COBJS-y += xilinx.o
  123 +COBJS-y += crc16.o
  124 +COBJS-y += xyzModem.o
  125 +COBJS-y += cmd_mac.o
  126 +COBJS-y += cmd_mfsl.o
55 127  
  128 +COBJS := $(COBJS-y)
56 129 SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
57 130 OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
58 131  
... ... @@ -27,8 +27,13 @@
27 27  
28 28 LIB = $(obj)libdisk.a
29 29  
30   -COBJS = part.o part_mac.o part_dos.o part_iso.o part_amiga.o
  30 +COBJS-y += part.o
  31 +COBJS-y += part_mac.o
  32 +COBJS-y += part_dos.o
  33 +COBJS-y += part_iso.o
  34 +COBJS-y += part_amiga.o
31 35  
  36 +COBJS := $(COBJS-y)
32 37 SRCS := $(COBJS:.o=.c)
33 38 OBJS := $(addprefix $(obj),$(COBJS))
34 39  
... ... @@ -27,34 +27,93 @@
27 27  
28 28 LIB = $(obj)libdrivers.a
29 29  
30   -COBJS = 3c589.o 5701rls.o ali512x.o at45.o ata_piix.o \
31   - ati_radeon_fb.o atmel_usart.o \
32   - bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
33   - cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
34   - ds1722.o e1000.o eepro100.o enc28j60.o \
35   - fsl_i2c.o fsl_pci_init.o \
36   - i8042.o inca-ip_sw.o isp116x-hcd.o \
37   - keyboard.o ks8695eth.o \
38   - lan91c96.o macb.o mpc8xx_pcmcia.o mw_eeprom.o \
39   - natsemi.o ne2000.o netarm_eth.o netconsole.o \
40   - ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
41   - omap24xx_i2c.o pc_keyb.o \
42   - pci.o pci_auto.o pci_indirect.o \
43   - pcnet.o plb2800_eth.o ps2ser.o ps2mult.o pxa_pcmcia.o \
44   - rpx_pcmcia.o rtl8019.o rtl8139.o rtl8169.o \
45   - s3c4510b_eth.o s3c4510b_uart.o \
46   - sed13806.o sed156x.o \
47   - serial.o serial_max3100.o \
48   - serial_xuartlite.o \
49   - sil680.o sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
50   - status_led.o sym53c8xx.o systemace.o ahci.o \
51   - ti_pci1410a.o tigon3.o tqm8xx_pcmcia.o tsec.o \
52   - tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
53   - usb_ohci.o \
54   - usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
55   - usbtty.o \
56   - videomodes.o w83c553f.o
  30 +COBJS-y += 3c589.o
  31 +COBJS-y += 5701rls.o
  32 +COBJS-y += ali512x.o
  33 +COBJS-y += at45.o
  34 +COBJS-y += ata_piix.o
  35 +COBJS-y += ati_radeon_fb.o
  36 +COBJS-y += atmel_usart.o
  37 +COBJS-y += bcm570x.o
  38 +COBJS-y += bcm570x_autoneg.o
  39 +COBJS-y += cfb_console.o
  40 +COBJS-y += cfi_flash.o
  41 +COBJS-y += cs8900.o
  42 +COBJS-y += ct69000.o
  43 +COBJS-y += dataflash.o
  44 +COBJS-y += dc2114x.o
  45 +COBJS-y += dm9000x.o
  46 +COBJS-y += ds1722.o
  47 +COBJS-y += e1000.o
  48 +COBJS-y += eepro100.o
  49 +COBJS-y += enc28j60.o
  50 +COBJS-y += fsl_i2c.o
  51 +COBJS-y += fsl_pci_init.o
  52 +COBJS-y += i8042.o
  53 +COBJS-y += inca-ip_sw.o
  54 +COBJS-y += isp116x-hcd.o
  55 +COBJS-y += keyboard.o
  56 +COBJS-y += ks8695eth.o
  57 +COBJS-y += lan91c96.o
  58 +COBJS-y += macb.o
  59 +COBJS-y += mpc8xx_pcmcia.o
  60 +COBJS-y += mw_eeprom.o
  61 +COBJS-y += natsemi.o
  62 +COBJS-y += ne2000.o
  63 +COBJS-y += netarm_eth.o
  64 +COBJS-y += netconsole.o
  65 +COBJS-y += ns16550.o
  66 +COBJS-y += ns8382x.o
  67 +COBJS-y += ns87308.o
  68 +COBJS-y += ns7520_eth.o
  69 +COBJS-y += omap1510_i2c.o
  70 +COBJS-y += omap24xx_i2c.o
  71 +COBJS-y += pc_keyb.o
  72 +COBJS-y += pci.o
  73 +COBJS-y += pci_auto.o
  74 +COBJS-y += pci_indirect.o
  75 +COBJS-y += pcnet.o
  76 +COBJS-y += plb2800_eth.o
  77 +COBJS-y += ps2ser.o
  78 +COBJS-y += ps2mult.o
  79 +COBJS-y += pxa_pcmcia.o
  80 +COBJS-y += rpx_pcmcia.o
  81 +COBJS-y += rtl8019.o
  82 +COBJS-y += rtl8139.o
  83 +COBJS-y += rtl8169.o
  84 +COBJS-y += s3c4510b_eth.o
  85 +COBJS-y += s3c4510b_uart.o
  86 +COBJS-y += sed13806.o
  87 +COBJS-y += sed156x.o
  88 +COBJS-y += serial.o
  89 +COBJS-y += serial_max3100.o
  90 +COBJS-y += serial_xuartlite.o
  91 +COBJS-y += sil680.o
  92 +COBJS-y += sl811_usb.o
  93 +COBJS-y += sm501.o
  94 +COBJS-y += smc91111.o
  95 +COBJS-y += smiLynxEM.o
  96 +COBJS-y += status_led.o
  97 +COBJS-y += sym53c8xx.o
  98 +COBJS-y += systemace.o
  99 +COBJS-y += ahci.o
  100 +COBJS-y += ti_pci1410a.o
  101 +COBJS-y += tigon3.o
  102 +COBJS-y += tqm8xx_pcmcia.o
  103 +COBJS-y += tsec.o
  104 +COBJS-y += tsi108_eth.o
  105 +COBJS-y += tsi108_i2c.o
  106 +COBJS-y += tsi108_pci.o
  107 +COBJS-y += usb_ohci.o
  108 +COBJS-y += usbdcore.o
  109 +COBJS-y += usbdcore_ep0.o
  110 +COBJS-y += usbdcore_mpc8xx.o
  111 +COBJS-y += usbdcore_omap1510.o
  112 +COBJS-y += usbtty.o
  113 +COBJS-y += videomodes.o
  114 +COBJS-y += w83c553f.o
57 115  
  116 +COBJS := $(COBJS-y)
58 117 SRCS := $(COBJS:.o=.c)
59 118 OBJS := $(addprefix $(obj),$(COBJS))
60 119  
drivers/nand/Makefile
... ... @@ -25,8 +25,14 @@
25 25  
26 26 LIB := $(obj)libnand.a
27 27  
28   -COBJS := nand.o nand_base.o nand_ids.o nand_ecc.o nand_bbt.o nand_util.o
  28 +COBJS-y += nand.o
  29 +COBJS-y += nand_base.o
  30 +COBJS-y += nand_ids.o
  31 +COBJS-y += nand_ecc.o
  32 +COBJS-y += nand_bbt.o
  33 +COBJS-y += nand_util.o
29 34  
  35 +COBJS := $(COBJS-y)
30 36 SRCS := $(COBJS:.o=.c)
31 37 OBJS := $(addprefix $(obj),$(COBJS))
32 38  
drivers/sk98lin/Makefile
... ... @@ -29,12 +29,26 @@
29 29  
30 30 LIB := $(obj)libsk98lin.a
31 31  
32   -COBJS := skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \
33   - ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o skvpd.o \
34   - skxmac2.o skcsum.o #skproc.o
  32 +COBJS-y += skge.o
  33 +COBJS-y += skaddr.o
  34 +COBJS-y += skgehwt.o
  35 +COBJS-y += skgeinit.o
  36 +COBJS-y += skgepnmi.o
  37 +COBJS-y += skgesirq.o
  38 +COBJS-y += ski2c.o
  39 +COBJS-y += sklm80.o
  40 +COBJS-y += skqueue.o
  41 +COBJS-y += skrlmt.o
  42 +COBJS-y += sktimer.o
  43 +COBJS-y += skvpd.o
  44 +COBJS-y += skxmac2.o
  45 +COBJS-y += skcsum.o
  46 +#COBJS-y += skproc.o
35 47  
36   -COBJS += uboot_skb.o uboot_drv.o
  48 +COBJS-y += uboot_skb.o
  49 +COBJS-y += uboot_drv.o
37 50  
  51 +COBJS := $(COBJS-y)
38 52 SRCS := $(COBJS:.o=.c)
39 53 OBJS := $(addprefix $(obj),$(COBJS))
40 54  
... ... @@ -30,8 +30,13 @@
30 30  
31 31 LIB = $(obj)libdtt.a
32 32  
33   -COBJS = lm75.o ds1621.o adm1021.o lm81.o ds1775.o
  33 +COBJS-y += lm75.o
  34 +COBJS-y += ds1621.o
  35 +COBJS-y += adm1021.o
  36 +COBJS-y += lm81.o
  37 +COBJS-y += ds1775.o
34 38  
  39 +COBJS := $(COBJS-y)
35 40 SRCS := $(COBJS:.o=.c)
36 41 OBJS := $(addprefix $(obj),$(COBJS))
37 42  
... ... @@ -26,9 +26,15 @@
26 26 LIB = $(obj)libjffs2.a
27 27  
28 28 AOBJS =
29   -COBJS = jffs2_1pass.o compr_rtime.o compr_rubin.o compr_zlib.o mini_inflate.o
30   -COBJS += compr_lzo.o compr_lzari.o
  29 +COBJS-y += jffs2_1pass.o
  30 +COBJS-y += compr_rtime.o
  31 +COBJS-y += compr_rubin.o
  32 +COBJS-y += compr_zlib.o
  33 +COBJS-y += mini_inflate.o
  34 +COBJS-y += compr_lzo.o
  35 +COBJS-y += compr_lzari.o
31 36  
  37 +COBJS := $(COBJS-y)
32 38 SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
33 39 OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
34 40  
lib_generic/Makefile
... ... @@ -25,11 +25,22 @@
25 25  
26 26 LIB = $(obj)libgeneric.a
27 27  
28   -COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \
29   - bzlib_randtable.o bzlib_huffman.o \
30   - crc32.o ctype.o display_options.o div64.o ldiv.o sha1.o \
31   - string.o vsprintf.o zlib.o
  28 +COBJS-y += bzlib.o
  29 +COBJS-y += bzlib_crctable.o
  30 +COBJS-y += bzlib_decompress.o
  31 +COBJS-y += bzlib_randtable.o
  32 +COBJS-y += bzlib_huffman.o
  33 +COBJS-y += crc32.o
  34 +COBJS-y += ctype.o
  35 +COBJS-y += display_options.o
  36 +COBJS-y += div64.o
  37 +COBJS-y += ldiv.o
  38 +COBJS-y += sha1.o
  39 +COBJS-y += string.o
  40 +COBJS-y += vsprintf.o
  41 +COBJS-y += zlib.o
32 42  
  43 +COBJS := $(COBJS-y)
33 44 SRCS := $(COBJS:.o=.c)
34 45 OBJS := $(addprefix $(obj),$(COBJS))
35 46  
... ... @@ -27,9 +27,9 @@
27 27  
28 28 SOBJS =
29 29  
30   -COBJS = fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o
  30 +COBJS-y += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o
31 31  
32   -
  32 +COBJS := $(COBJS-y)
33 33 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
34 34 OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
35 35  
... ... @@ -27,8 +27,15 @@
27 27  
28 28 LIB = $(obj)libnet.a
29 29  
30   -COBJS = net.o tftp.o bootp.o rarp.o eth.o nfs.o sntp.o
  30 +COBJS-y += net.o
  31 +COBJS-y += tftp.o
  32 +COBJS-y += bootp.o
  33 +COBJS-y += rarp.o
  34 +COBJS-y += eth.o
  35 +COBJS-y += nfs.o
  36 +COBJS-y += sntp.o
31 37  
  38 +COBJS := $(COBJS-y)
32 39 SRCS := $(COBJS:.o=.c)
33 40 OBJS := $(addprefix $(obj),$(COBJS))
34 41  
... ... @@ -27,13 +27,31 @@
27 27  
28 28 LIB = $(obj)librtc.a
29 29  
30   -COBJS = date.o \
31   - bf5xx_rtc.o ds12887.o ds1302.o ds1306.o ds1307.o \
32   - ds1337.o ds1374.o ds1556.o ds164x.o ds174x.o ds3231.o \
33   - m41t11.o max6900.o m48t35ax.o mc146818.o mk48t59.o \
34   - mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o rs5c372.o \
35   - mcfrtc.o
  30 +COBJS-y += date.o
  31 +COBJS-y += bf5xx_rtc.o
  32 +COBJS-y += ds12887.o
  33 +COBJS-y += ds1302.o
  34 +COBJS-y += ds1306.o
  35 +COBJS-y += ds1307.o
  36 +COBJS-y += ds1337.o
  37 +COBJS-y += ds1374.o
  38 +COBJS-y += ds1556.o
  39 +COBJS-y += ds164x.o
  40 +COBJS-y += ds174x.o
  41 +COBJS-y += ds3231.o
  42 +COBJS-y += m41t11.o
  43 +COBJS-y += max6900.o
  44 +COBJS-y += m48t35ax.o
  45 +COBJS-y += mc146818.o
  46 +COBJS-y += mk48t59.o
  47 +COBJS-y += mpc5xxx.o
  48 +COBJS-y += mpc8xx.o
  49 +COBJS-y += pcf8563.o
  50 +COBJS-y += s3c24x0_rtc.o
  51 +COBJS-y += rs5c372.o
  52 +COBJS-y += mcfrtc.o
36 53  
  54 +COBJS := $(COBJS-y)
37 55 SRCS := $(COBJS:.o=.c)
38 56 OBJS := $(addprefix $(obj),$(COBJS))
39 57