[U-Boot-Users] [PATCH: cmdcfg: 14/19] board/[Ma-i]*: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely.

All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

Signed-off-by: Jon Loeliger jdl@freescale.com --- board/MAI/AmigaOneG3SE/cmd_boota.c | 2 +- board/MAI/menu/cmd_menu.c | 2 +- board/Marvell/common/serial.c | 2 +- board/alaska/alaska.c | 2 +- board/altera/dk1c20/dk1c20.c | 2 +- board/amirix/ap1000/serial.c | 2 +- board/at91rm9200dk/at91rm9200dk.c | 4 ++-- board/atc/atc.c | 2 +- board/atc/ti113x.c | 2 +- board/atmel/atstk1000/eth.c | 2 +- board/bc3450/cmd_bc3450.c | 2 +- board/bf537-stamp/bf537-stamp.c | 2 +- board/bf537-stamp/ether_bf537.c | 2 +- board/bf537-stamp/nand.c | 2 +- board/c2mon/pcmcia.c | 6 +++--- board/cmc_pu2/cmc_pu2.c | 2 +- board/cogent/serial.c | 2 +- board/cpc45/cpc45.c | 2 +- board/cpc45/pd67290.c | 2 +- board/cpu86/cpu86.c | 2 +- board/cpu87/cpu87.c | 2 +- board/csb637/csb637.c | 2 +- board/dave/PPChameleonEVB/nand.c | 2 +- board/delta/nand.c | 2 +- board/esd/ash405/ash405.c | 2 +- board/esd/cms700/cms700.c | 2 +- board/esd/common/auto_update.c | 14 +++++++------- board/esd/common/cmd_loadpci.c | 2 +- board/esd/cpci750/serial.c | 2 +- board/esd/hh405/hh405.c | 2 +- board/esd/hub405/hub405.c | 2 +- board/esd/ocrtc/cmd_ocrtc.c | 2 +- board/esd/pci405/cmd_pci405.c | 2 +- board/esd/plu405/plu405.c | 2 +- board/esd/voh405/voh405.c | 2 +- board/esd/wuh405/wuh405.c | 2 +- board/etin/debris/phantom.c | 2 +- board/evb64260/eth.c | 4 ++-- board/evb64260/serial.c | 2 +- board/evb64260/zuma_pbb.c | 4 ++-- board/fads/fads.c | 2 +- board/fads/fads.h | 6 +++--- board/fads/pcmcia.c | 6 +++--- board/funkwerk/vovpn-gw/m88e6060.c | 2 +- board/funkwerk/vovpn-gw/vovpn-gw.c | 4 ++-- board/g2000/g2000.c | 4 ++-- board/gen860t/gen860t.c | 4 ++-- board/genietv/genietv.c | 2 +- board/gth/pcmcia.c | 6 +++--- board/hymod/bsp.c | 2 +- board/icu862/pcmcia.c | 6 +++--- board/ids8247/ids8247.c | 2 +- board/ixdp425/ixdp425.c | 2 +- 53 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/board/MAI/AmigaOneG3SE/cmd_boota.c b/board/MAI/AmigaOneG3SE/cmd_boota.c index 143bba2..ffb0790 100644 --- a/board/MAI/AmigaOneG3SE/cmd_boota.c +++ b/board/MAI/AmigaOneG3SE/cmd_boota.c @@ -119,7 +119,7 @@ int do_boota (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])

return 0; } -#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP) +#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP) U_BOOT_CMD( boota, 3, 1, do_boota, "boota - boot an Amiga kernel\n", diff --git a/board/MAI/menu/cmd_menu.c b/board/MAI/menu/cmd_menu.c index a515bd8..214a6eb 100644 --- a/board/MAI/menu/cmd_menu.c +++ b/board/MAI/menu/cmd_menu.c @@ -7,7 +7,7 @@ int do_menu( cmd_tbl_t *cmdtp, /*bd_t *bd,*/ int flag, int argc, char *argv[] ) return 0; }

-#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP) +#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP) U_BOOT_CMD( menu, 1, 1, do_menu, "menu - display BIOS setup menu\n", diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c index 6a1d4d7..7eef8bd 100644 --- a/board/Marvell/common/serial.c +++ b/board/Marvell/common/serial.c @@ -145,7 +145,7 @@ void serial_puts (const char *s) } }

-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) void kgdb_serial_init (void) { } diff --git a/board/alaska/alaska.c b/board/alaska/alaska.c index 93874b2..5903e68 100644 --- a/board/alaska/alaska.c +++ b/board/alaska/alaska.c @@ -138,7 +138,7 @@ long int initdram (int board_type) size = dramSetup ();

/* if iCache ad dCache is defined */ -#if (CONFIG_COMMANDS & CFG_CMD_CACHE) +#if (CONFIG_COMMANDS & CFG_CMD_CACHE) || defined(CONFIG_CMD_CACHE) /* setupBat(size);*/ #endif

diff --git a/board/altera/dk1c20/dk1c20.c b/board/altera/dk1c20/dk1c20.c index 98ee7a7..0beca5f 100644 --- a/board/altera/dk1c20/dk1c20.c +++ b/board/altera/dk1c20/dk1c20.c @@ -55,7 +55,7 @@ long int initdram (int board_type) return (0); }

-#if (CONFIG_COMMANDS & CFG_CMD_IDE) +#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE) int ide_preinit (void) { nios_pio_t *present = (nios_pio_t *) CFG_CF_PRESENT; diff --git a/board/amirix/ap1000/serial.c b/board/amirix/ap1000/serial.c index c6ee772..e781ec6 100644 --- a/board/amirix/ap1000/serial.c +++ b/board/amirix/ap1000/serial.c @@ -84,7 +84,7 @@ void serial_puts (const char *s) } }

-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) void kgdb_serial_init (void) { } diff --git a/board/at91rm9200dk/at91rm9200dk.c b/board/at91rm9200dk/at91rm9200dk.c index 002981a..71b0b01 100644 --- a/board/at91rm9200dk/at91rm9200dk.c +++ b/board/at91rm9200dk/at91rm9200dk.c @@ -62,7 +62,7 @@ int dram_init (void) }

#ifdef CONFIG_DRIVER_ETHER -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

/* * Name: @@ -89,7 +89,7 @@ void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops) * Disk On Chip (NAND) Millenium initialization. * The NAND lives in the CS2* space */ -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) extern ulong nand_probe (ulong physadr);

#define AT91_SMARTMEDIA_BASE 0x40000000 /* physical address to access memory on NCS3 */ diff --git a/board/atc/atc.c b/board/atc/atc.c index d2c6b3b..f98d749 100644 --- a/board/atc/atc.c +++ b/board/atc/atc.c @@ -379,7 +379,7 @@ long int initdram (int board_type) return (psize); }

-#if (CONFIG_COMMANDS & CFG_CMD_DOC) +#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) extern void doc_probe (ulong physadr); void doc_init (void) { diff --git a/board/atc/ti113x.c b/board/atc/ti113x.c index d5e935c..2cc0473 100644 --- a/board/atc/ti113x.c +++ b/board/atc/ti113x.c @@ -591,7 +591,7 @@ exit: return rc; }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_off (void) { printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n"); diff --git a/board/atmel/atstk1000/eth.c b/board/atmel/atstk1000/eth.c index 3a7916e..735e2a9 100644 --- a/board/atmel/atstk1000/eth.c +++ b/board/atmel/atstk1000/eth.c @@ -27,7 +27,7 @@

extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);

-#if defined(CONFIG_MACB) && (CONFIG_COMMANDS & CFG_CMD_NET) +#if defined(CONFIG_MACB) && ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) void atstk1000_eth_initialize(bd_t *bi) { int id = 0; diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c index 6bbe4e6..f640663 100644 --- a/board/bc3450/cmd_bc3450.c +++ b/board/bc3450/cmd_bc3450.c @@ -30,7 +30,7 @@ /* * BC3450 specific commands */ -#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)

#undef DEBUG #ifdef DEBUG diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c index 47f7c9e..4f783ad 100644 --- a/board/bf537-stamp/bf537-stamp.c +++ b/board/bf537-stamp/bf537-stamp.c @@ -159,7 +159,7 @@ int misc_init_r(void) unsigned char *pMACaddr = (unsigned char *)0x203F0000; u8 SrcAddr[6] = { 0x02, 0x80, 0xAD, 0x20, 0x31, 0xB8 };

-#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) /* The 0xFF check here is to make sure we don't use the address * in flash if it's simply been erased (aka all 0xFF values) */ if (getenv("ethaddr") == NULL && is_valid_ether_addr(pMACaddr)) { diff --git a/board/bf537-stamp/ether_bf537.c b/board/bf537-stamp/ether_bf537.c index f00837a..3da0ae6 100644 --- a/board/bf537-stamp/ether_bf537.c +++ b/board/bf537-stamp/ether_bf537.c @@ -42,7 +42,7 @@ #define DEBUGF(fmt,args...) #endif

-#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

#define RXBUF_BASE_ADDR 0xFF900000 #define TXBUF_BASE_ADDR 0xFF800000 diff --git a/board/bf537-stamp/nand.c b/board/bf537-stamp/nand.c index 4d6e776..11da14e 100644 --- a/board/bf537-stamp/nand.c +++ b/board/bf537-stamp/nand.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/io.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)

#include <nand.h>

diff --git a/board/c2mon/pcmcia.c b/board/c2mon/pcmcia.c index 5e50c4d..07b67ac 100644 --- a/board/c2mon/pcmcia.c +++ b/board/c2mon/pcmcia.c @@ -4,11 +4,11 @@

#undef CONFIG_PCMCIA

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #define CONFIG_PCMCIA #endif

-#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif

@@ -165,7 +165,7 @@ int pcmcia_hardware_enable(int slot) }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_hardware_disable(int slot) { volatile immap_t *immap; diff --git a/board/cmc_pu2/cmc_pu2.c b/board/cmc_pu2/cmc_pu2.c index 9ae3c42..9a2e21e 100644 --- a/board/cmc_pu2/cmc_pu2.c +++ b/board/cmc_pu2/cmc_pu2.c @@ -155,7 +155,7 @@ int hw_detect (void) }

#ifdef CONFIG_DRIVER_ETHER -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

/* * Name: diff --git a/board/cogent/serial.c b/board/cogent/serial.c index 2b595a8..3f600ca 100644 --- a/board/cogent/serial.c +++ b/board/cogent/serial.c @@ -90,7 +90,7 @@ int serial_tstc (void)

#endif /* CONS_NONE */

-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) && \ +#if ((CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)) && \ defined(CONFIG_KGDB_NONE)

#if CONFIG_KGDB_INDEX == CONFIG_CONS_INDEX diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c index 51b0085..5db7db3 100644 --- a/board/cpc45/cpc45.c +++ b/board/cpc45/cpc45.c @@ -240,7 +240,7 @@ int sysControlDisplay (int digit, /* number of digit 0..7 */ return (0); }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)

#ifdef CFG_PCMCIA_MEM_ADDR volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR; diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c index 6ca3e7b..afba0b9 100644 --- a/board/cpc45/pd67290.c +++ b/board/cpc45/pd67290.c @@ -772,7 +772,7 @@ exit: return rc; }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_off (void) { printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n"); diff --git a/board/cpu86/cpu86.c b/board/cpu86/cpu86.c index 3eb5b35..6bdc1b1 100644 --- a/board/cpu86/cpu86.c +++ b/board/cpu86/cpu86.c @@ -312,7 +312,7 @@ long int initdram (int board_type) return (psize); }

-#if (CONFIG_COMMANDS & CFG_CMD_DOC) +#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) extern void doc_probe (ulong physadr); void doc_init (void) { diff --git a/board/cpu87/cpu87.c b/board/cpu87/cpu87.c index 9fecdd0..bd9b207 100644 --- a/board/cpu87/cpu87.c +++ b/board/cpu87/cpu87.c @@ -321,7 +321,7 @@ long int initdram (int board_type) return (psize); }

-#if (CONFIG_COMMANDS & CFG_CMD_DOC) +#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) extern void doc_probe (ulong physadr); void doc_init (void) { diff --git a/board/csb637/csb637.c b/board/csb637/csb637.c index aeb1a13..2cfad42 100644 --- a/board/csb637/csb637.c +++ b/board/csb637/csb637.c @@ -57,7 +57,7 @@ int dram_init (void) }

#ifdef CONFIG_DRIVER_ETHER -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

/* * Name: diff --git a/board/dave/PPChameleonEVB/nand.c b/board/dave/PPChameleonEVB/nand.c index f5c3dd9..841d6fb 100644 --- a/board/dave/PPChameleonEVB/nand.c +++ b/board/dave/PPChameleonEVB/nand.c @@ -23,7 +23,7 @@ #include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)

#include <nand.h>

diff --git a/board/delta/nand.c b/board/delta/nand.c index d170938..c4f5870 100644 --- a/board/delta/nand.c +++ b/board/delta/nand.c @@ -22,7 +22,7 @@

#include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #if !defined(CFG_NAND_LEGACY)

#include <nand.h> diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c index 84fc3a0..5ea3c4d 100644 --- a/board/esd/ash405/ash405.c +++ b/board/esd/ash405/ash405.c @@ -238,7 +238,7 @@ int testdram (void)

/* ------------------------------------------------------------------------- */

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/esd/cms700/cms700.c b/board/esd/cms700/cms700.c index cb04710..1e7479b 100644 --- a/board/esd/cms700/cms700.c +++ b/board/esd/cms700/cms700.c @@ -235,7 +235,7 @@ U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,

/* ------------------------------------------------------------------------- */

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index 001fd68..e079eca 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -24,7 +24,7 @@

#include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && !defined(CFG_NAND_LEGACY) #warning CFG_NAND_LEGACY not defined in a file using the legacy NAND support! #endif

@@ -39,7 +39,7 @@

#ifdef CONFIG_AUTO_UPDATE

-#if !(CONFIG_COMMANDS & CFG_CMD_FAT) +#if !((CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)) #error "must define CFG_CMD_FAT" #endif

@@ -73,7 +73,7 @@ extern int flash_sect_erase(ulong, ulong); extern int flash_sect_protect (int, ulong, ulong); extern int flash_write (char *, ulong, ulong);

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) +#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY) /* references to names in cmd_nand.c */ #define NANDRW_READ 0x01 #define NANDRW_WRITE 0x00 @@ -187,7 +187,7 @@ int au_do_update(int i, long sz) int off, rc; uint nbytes; int k; -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) +#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY) int total; #endif

@@ -261,7 +261,7 @@ int au_do_update(int i, long sz) debug ("flash_sect_erase(%lx, %lx);\n", start, end); flash_sect_erase(start, end); } else { -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) +#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY) printf("Updating NAND FLASH with image %s\n", au_image[i].name); debug ("nand_legacy_erase(%lx, %lx);\n", start, end); rc = nand_legacy_erase (nand_dev_desc, start, end - start + 1, 0); @@ -289,7 +289,7 @@ int au_do_update(int i, long sz) debug ("flash_write(%p, %lx %x)\n", addr, start, nbytes); rc = flash_write((char *)addr, start, nbytes); } else { -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) +#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY) debug ("nand_legacy_rw(%p, %lx %x)\n", addr, start, nbytes); rc = nand_legacy_rw(nand_dev_desc, NANDRW_WRITE | NANDRW_JFFS2, start, nbytes, (size_t *)&total, (uchar *)addr); @@ -307,7 +307,7 @@ int au_do_update(int i, long sz) if (au_image[i].type != AU_NAND) { rc = crc32 (0, (uchar *)(start + off), ntohl(hdr->ih_size)); } else { -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) +#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY) rc = nand_legacy_rw(nand_dev_desc, NANDRW_READ | NANDRW_JFFS2 | NANDRW_JFFS2_SKIP, start, nbytes, (size_t *)&total, (uchar *)addr); rc = crc32 (0, (uchar *)(addr + off), ntohl(hdr->ih_size)); diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c index bf796ff..aab1ba3 100644 --- a/board/esd/common/cmd_loadpci.c +++ b/board/esd/common/cmd_loadpci.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h>

-#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)

extern int do_bootm (cmd_tbl_t *, int, int, char *[]); extern int do_autoscript (cmd_tbl_t *, int, int, char *[]); diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c index ba32ac1..b830052 100644 --- a/board/esd/cpci750/serial.c +++ b/board/esd/cpci750/serial.c @@ -80,7 +80,7 @@ void serial_puts (const char *s) } }

-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) void kgdb_serial_init (void) { } diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c index ea344c0..3153438 100644 --- a/board/esd/hh405/hh405.c +++ b/board/esd/hh405/hh405.c @@ -690,7 +690,7 @@ void ide_set_reset(int on) #endif /* CONFIG_IDE_RESET */

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/esd/hub405/hub405.c b/board/esd/hub405/hub405.c index 1e0accb..512871c 100644 --- a/board/esd/hub405/hub405.c +++ b/board/esd/hub405/hub405.c @@ -260,7 +260,7 @@ int testdram (void) }

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/esd/ocrtc/cmd_ocrtc.c b/board/esd/ocrtc/cmd_ocrtc.c index ffbb4ad..3c52d4c 100644 --- a/board/esd/ocrtc/cmd_ocrtc.c +++ b/board/esd/ocrtc/cmd_ocrtc.c @@ -28,7 +28,7 @@ #include <405gp_pci.h>

-#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)

/* * Set device number on pci board diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c index 0315c3d..0ed0c8e 100644 --- a/board/esd/pci405/cmd_pci405.c +++ b/board/esd/pci405/cmd_pci405.c @@ -33,7 +33,7 @@ #include "pci405.h"

-#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)

extern int do_bootm (cmd_tbl_t *, int, int, char *[]); extern int do_bootvx (cmd_tbl_t *, int, int, char *[]); diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index 59171f8..bae76e7 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -262,7 +262,7 @@ void ide_set_reset(int on) #endif /* CONFIG_IDE_RESET */

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c index 22995b5..a63a59e 100644 --- a/board/esd/voh405/voh405.c +++ b/board/esd/voh405/voh405.c @@ -342,7 +342,7 @@ void ide_set_reset(int on) #endif /* CONFIG_IDE_RESET */

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/esd/wuh405/wuh405.c b/board/esd/wuh405/wuh405.c index 5a1a3f3..e5e3a3f 100644 --- a/board/esd/wuh405/wuh405.c +++ b/board/esd/wuh405/wuh405.c @@ -238,7 +238,7 @@ int testdram (void)

/* ------------------------------------------------------------------------- */

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/etin/debris/phantom.c b/board/etin/debris/phantom.c index 0b81fc0..ab7c3cf 100644 --- a/board/etin/debris/phantom.c +++ b/board/etin/debris/phantom.c @@ -18,7 +18,7 @@ #include <command.h> #include <rtc.h>

-#if (CONFIG_COMMANDS & CFG_CMD_DATE) +#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)

#define RTC_BASE (CFG_NVRAM_BASE_ADDR + 0x7fff8)

diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c index eafa48b..2772058 100644 --- a/board/evb64260/eth.c +++ b/board/evb64260/eth.c @@ -31,7 +31,7 @@ Skeleton NIC driver for Etherboot #include "eth.h" #include "eth_addrtbl.h"

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) +#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI)

#define GT6426x_ETH_BUF_SIZE 1536

@@ -797,7 +797,7 @@ gt6426x_eth_initialize(bd_t *bis)

eth_register(dev); -#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) +#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) miiphy_register(dev->name, gt6426x_miiphy_read, gt6426x_miiphy_write); #endif diff --git a/board/evb64260/serial.c b/board/evb64260/serial.c index 191445c..d35995a 100644 --- a/board/evb64260/serial.c +++ b/board/evb64260/serial.c @@ -153,7 +153,7 @@ serial_puts (const char *s) } }

-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) void kgdb_serial_init(void) { diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c index d64025a..54e55dd 100644 --- a/board/evb64260/zuma_pbb.c +++ b/board/evb64260/zuma_pbb.c @@ -1,7 +1,7 @@ #include <common.h> #include <malloc.h>

-#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP) #include <command.h> #endif

@@ -166,7 +166,7 @@ void zuma_init_pbb (void)

}

-#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)

static int last_cmd = 4; /* write increment */ static int last_size = 64; diff --git a/board/fads/fads.c b/board/fads/fads.c index 7b04af5..99a69ab 100644 --- a/board/fads/fads.c +++ b/board/fads/fads.c @@ -778,7 +778,7 @@ int checkboard (void)

/* ========================================================================= */

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)

#ifdef CFG_PCMCIA_MEM_ADDR volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR; diff --git a/board/fads/fads.h b/board/fads/fads.h index 41f18b5..29c226a 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -118,7 +118,7 @@ #define CFG_HUSH_PARSER #define CFG_PROMPT_HUSH_PS2 "> " #define CFG_LONGHELP /* #undef to save memory */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ #else #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ @@ -217,7 +217,7 @@

#define CFG_DIRECT_FLASH_TFTP

-#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) +#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)

/* * JFFS2 partitions @@ -249,7 +249,7 @@ /*----------------------------------------------------------------------- * I2C configuration */ -#if (CONFIG_COMMANDS & CFG_CMD_I2C) +#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C) #define CONFIG_HARD_I2C 1 /* I2C with hardware support */ #define CFG_I2C_SPEED 400000 /* I2C speed and slave address defaults */ #define CFG_I2C_SLAVE 0x7F diff --git a/board/fads/pcmcia.c b/board/fads/pcmcia.c index 978c16b..0fc78bb 100644 --- a/board/fads/pcmcia.c +++ b/board/fads/pcmcia.c @@ -4,11 +4,11 @@

#undef CONFIG_PCMCIA

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #define CONFIG_PCMCIA #endif

-#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif

@@ -73,7 +73,7 @@ int pcmcia_hardware_enable(int slot) return 0; }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_hardware_disable(int slot) { *((uint *)BCSR1) &= ~BCSR1_PCCEN; diff --git a/board/funkwerk/vovpn-gw/m88e6060.c b/board/funkwerk/vovpn-gw/m88e6060.c index 03a03d0..8035ca4 100644 --- a/board/funkwerk/vovpn-gw/m88e6060.c +++ b/board/funkwerk/vovpn-gw/m88e6060.c @@ -31,7 +31,7 @@

#include "m88e6060.h"

-#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) static int prtTab[M88X_PRT_CNT] = { 8, 9, 10, 11, 12, 13 }; static int phyTab[M88X_PHY_CNT] = { 0, 1, 2, 3, 4 };

diff --git a/board/funkwerk/vovpn-gw/vovpn-gw.c b/board/funkwerk/vovpn-gw/vovpn-gw.c index 97f81ee..c9d10da 100644 --- a/board/funkwerk/vovpn-gw/vovpn-gw.c +++ b/board/funkwerk/vovpn-gw/vovpn-gw.c @@ -184,7 +184,7 @@ const iop_conf_t iop_conf_tab[4][32] = { void reset_phy (void) { volatile ioport_t *iop; -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) int i; unsigned short val; #endif @@ -193,7 +193,7 @@ void reset_phy (void)

/* Reset the PHY */ iop->pdat &= 0xfff7ffff; /* PA12 = |SWITCH_RESET */ -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) udelay(20000); iop->pdat |= 0x00080000; for (i=0; i<100; i++) { diff --git a/board/g2000/g2000.c b/board/g2000/g2000.c index 39b5c70..673e85f 100644 --- a/board/g2000/g2000.c +++ b/board/g2000/g2000.c @@ -73,7 +73,7 @@ int misc_init_f (void)

int misc_init_r (void) { -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) /* * Set NAND-FLASH GPIO signals to default */ @@ -184,7 +184,7 @@ int testdram (void) }

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include <linux/mtd/nand_legacy.h> extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c index eb73221..4fff5a3 100644 --- a/board/gen860t/gen860t.c +++ b/board/gen860t/gen860t.c @@ -222,7 +222,7 @@ long int initdram (int board_type) * Disk On Chip (DOC) Millenium initialization. * The DOC lives in the CS2* space */ -#if (CONFIG_COMMANDS & CFG_CMD_DOC) +#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) extern void doc_probe (ulong physadr);

void doc_init (void) @@ -250,7 +250,7 @@ int misc_init_r (void)

config_mpc8xx_ioports (immr);

-#if (CONFIG_COMMANDS & CFG_CMD_MII) +#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) mii_init (); #endif

diff --git a/board/genietv/genietv.c b/board/genietv/genietv.c index 5f8c899..5dd1224 100644 --- a/board/genietv/genietv.c +++ b/board/genietv/genietv.c @@ -267,7 +267,7 @@ static long int dram_size (long int mbmr_value, long int *base, return (size); }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)

#ifdef CFG_PCMCIA_MEM_ADDR volatile unsigned char *pcmcia_mem = (unsigned char *) CFG_PCMCIA_MEM_ADDR; diff --git a/board/gth/pcmcia.c b/board/gth/pcmcia.c index fce5492..9cd4b8a 100644 --- a/board/gth/pcmcia.c +++ b/board/gth/pcmcia.c @@ -4,11 +4,11 @@

#undef CONFIG_PCMCIA

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #define CONFIG_PCMCIA #endif

-#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif

@@ -83,7 +83,7 @@ int pcmcia_hardware_enable (int slot)

return 0; } -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_hardware_disable(int slot) { return 0; /* No hardware to disable */ diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c index 6868f26..228a837 100644 --- a/board/hymod/bsp.c +++ b/board/hymod/bsp.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; * Board Special Commands: FPGA load/store, EEPROM erase */

-#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)

#define LOAD_SUCCESS 0 #define LOAD_FAIL_NOCONF 1 diff --git a/board/icu862/pcmcia.c b/board/icu862/pcmcia.c index 20f653b..04789fa 100644 --- a/board/icu862/pcmcia.c +++ b/board/icu862/pcmcia.c @@ -4,11 +4,11 @@

#undef CONFIG_PCMCIA

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #define CONFIG_PCMCIA #endif

-#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif

@@ -155,7 +155,7 @@ int pcmcia_hardware_enable(int slot) }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_hardware_disable(int slot) { volatile immap_t *immap; diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c index 7b9a83d..3e7ef5a 100644 --- a/board/ids8247/ids8247.c +++ b/board/ids8247/ids8247.c @@ -300,7 +300,7 @@ int misc_init_r (void) gd->bd->bi_flashstart = 0xff800000; }

-#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) extern ulong nand_probe (ulong physadr);

diff --git a/board/ixdp425/ixdp425.c b/board/ixdp425/ixdp425.c index eaf7cde..fc25428 100644 --- a/board/ixdp425/ixdp425.c +++ b/board/ixdp425/ixdp425.c @@ -112,7 +112,7 @@ int dram_init (void) return (0); }

-#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined(CONFIG_PCI) +#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI) extern struct pci_controller hose; extern void pci_ixp_init(struct pci_controller * hose);