board/[A-Za-c]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-09 18:19:09 -05:00
parent a593814f2b
commit fcec2eb93e
22 changed files with 31 additions and 31 deletions

View file

@ -119,7 +119,7 @@ int do_boota (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 0; return 0;
} }
#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP) #if defined(CONFIG_AMIGAONEG3SE) && defined(CONFIG_CMD_BSP)
U_BOOT_CMD( U_BOOT_CMD(
boota, 3, 1, do_boota, boota, 3, 1, do_boota,
"boota - boot an Amiga kernel\n", "boota - boot an Amiga kernel\n",

View file

@ -7,7 +7,7 @@ int do_menu( cmd_tbl_t *cmdtp, /*bd_t *bd,*/ int flag, int argc, char *argv[] )
return 0; return 0;
} }
#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP) #if defined(CONFIG_AMIGAONEG3SE) && defined(CONFIG_CMD_BSP)
U_BOOT_CMD( U_BOOT_CMD(
menu, 1, 1, do_menu, menu, 1, 1, do_menu,
"menu - display BIOS setup menu\n", "menu - display BIOS setup menu\n",

View file

@ -145,7 +145,7 @@ void serial_puts (const char *s)
} }
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void) void kgdb_serial_init (void)
{ {
} }

View file

@ -138,7 +138,7 @@ long int initdram (int board_type)
size = dramSetup (); size = dramSetup ();
/* if iCache ad dCache is defined */ /* if iCache ad dCache is defined */
#if (CONFIG_COMMANDS & CFG_CMD_CACHE) || defined(CONFIG_CMD_CACHE) #if defined(CONFIG_CMD_CACHE)
/* setupBat(size);*/ /* setupBat(size);*/
#endif #endif

View file

@ -55,7 +55,7 @@ long int initdram (int board_type)
return (0); return (0);
} }
#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE) #if defined(CONFIG_CMD_IDE)
int ide_preinit (void) int ide_preinit (void)
{ {
nios_pio_t *present = (nios_pio_t *) CFG_CF_PRESENT; nios_pio_t *present = (nios_pio_t *) CFG_CF_PRESENT;
@ -78,4 +78,4 @@ int ide_preinit (void)
return 0; return 0;
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_IDE */ #endif

View file

@ -84,7 +84,7 @@ void serial_puts (const char *s)
} }
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void) void kgdb_serial_init (void)
{ {
} }

View file

@ -62,7 +62,7 @@ int dram_init (void)
} }
#ifdef CONFIG_DRIVER_ETHER #ifdef CONFIG_DRIVER_ETHER
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
/* /*
* Name: * Name:
@ -82,14 +82,14 @@ void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops)
p_phyops->AutoNegotiate = dm9161_AutoNegotiate; p_phyops->AutoNegotiate = dm9161_AutoNegotiate;
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_NET */ #endif
#endif /* CONFIG_DRIVER_ETHER */ #endif /* CONFIG_DRIVER_ETHER */
/* /*
* Disk On Chip (NAND) Millenium initialization. * Disk On Chip (NAND) Millenium initialization.
* The NAND lives in the CS2* space * The NAND lives in the CS2* space
*/ */
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
extern ulong nand_probe (ulong physadr); extern ulong nand_probe (ulong physadr);
#define AT91_SMARTMEDIA_BASE 0x40000000 /* physical address to access memory on NCS3 */ #define AT91_SMARTMEDIA_BASE 0x40000000 /* physical address to access memory on NCS3 */

View file

@ -379,7 +379,7 @@ long int initdram (int board_type)
return (psize); return (psize);
} }
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) #if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr); extern void doc_probe (ulong physadr);
void doc_init (void) void doc_init (void)
{ {

View file

@ -591,7 +591,7 @@ exit:
return rc; return rc;
} }
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
int pcmcia_off (void) int pcmcia_off (void)
{ {
printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n"); printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n");

View file

@ -27,7 +27,7 @@
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr); extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
#if defined(CONFIG_MACB) && ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) #if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET)
void atstk1000_eth_initialize(bd_t *bi) void atstk1000_eth_initialize(bd_t *bi)
{ {
int id = 0; int id = 0;

View file

@ -30,7 +30,7 @@
/* /*
* BC3450 specific commands * BC3450 specific commands
*/ */
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP) #if defined(CONFIG_CMD_BSP)
#undef DEBUG #undef DEBUG
#ifdef DEBUG #ifdef DEBUG

View file

@ -159,7 +159,7 @@ int misc_init_r(void)
unsigned char *pMACaddr = (unsigned char *)0x203F0000; unsigned char *pMACaddr = (unsigned char *)0x203F0000;
u8 SrcAddr[6] = { 0x02, 0x80, 0xAD, 0x20, 0x31, 0xB8 }; u8 SrcAddr[6] = { 0x02, 0x80, 0xAD, 0x20, 0x31, 0xB8 };
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
/* The 0xFF check here is to make sure we don't use the address /* 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) */ * in flash if it's simply been erased (aka all 0xFF values) */
if (getenv("ethaddr") == NULL && is_valid_ether_addr(pMACaddr)) { if (getenv("ethaddr") == NULL && is_valid_ether_addr(pMACaddr)) {
@ -171,7 +171,7 @@ int misc_init_r(void)
if (getenv("ethaddr")) { if (getenv("ethaddr")) {
SetupMacAddr(SrcAddr); SetupMacAddr(SrcAddr);
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_NET */ #endif
#endif /* BFIN_BOOT_MODE == BF537_BYPASS_BOOT */ #endif /* BFIN_BOOT_MODE == BF537_BYPASS_BOOT */
#if defined(CONFIG_BFIN_IDE) #if defined(CONFIG_BFIN_IDE)

View file

@ -42,7 +42,7 @@
#define DEBUGF(fmt,args...) #define DEBUGF(fmt,args...)
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#define RXBUF_BASE_ADDR 0xFF900000 #define RXBUF_BASE_ADDR 0xFF900000
#define TXBUF_BASE_ADDR 0xFF800000 #define TXBUF_BASE_ADDR 0xFF800000

View file

@ -23,7 +23,7 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
#include <nand.h> #include <nand.h>
@ -103,4 +103,4 @@ void board_nand_init(struct nand_chip *nand)
nand->dev_ready = bfin_device_ready; nand->dev_ready = bfin_device_ready;
nand->chip_delay = 30; nand->chip_delay = 30;
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ #endif

View file

@ -4,11 +4,11 @@
#undef CONFIG_PCMCIA #undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA #define CONFIG_PCMCIA
#endif #endif
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#define CONFIG_PCMCIA #define CONFIG_PCMCIA
#endif #endif
@ -165,7 +165,7 @@ int pcmcia_hardware_enable(int slot)
} }
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot) int pcmcia_hardware_disable(int slot)
{ {
volatile immap_t *immap; volatile immap_t *immap;

View file

@ -155,7 +155,7 @@ int hw_detect (void)
} }
#ifdef CONFIG_DRIVER_ETHER #ifdef CONFIG_DRIVER_ETHER
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
/* /*
* Name: * Name:
@ -175,5 +175,5 @@ void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops)
p_phyops->AutoNegotiate = dm9161_AutoNegotiate; p_phyops->AutoNegotiate = dm9161_AutoNegotiate;
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_NET */ #endif
#endif /* CONFIG_DRIVER_ETHER */ #endif /* CONFIG_DRIVER_ETHER */

View file

@ -90,7 +90,7 @@ int serial_tstc (void)
#endif /* CONS_NONE */ #endif /* CONS_NONE */
#if ((CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)) && \ #if defined(CONFIG_CMD_KGDB) && \
defined(CONFIG_KGDB_NONE) defined(CONFIG_KGDB_NONE)
#if CONFIG_KGDB_INDEX == CONFIG_CONS_INDEX #if CONFIG_KGDB_INDEX == CONFIG_CONS_INDEX

View file

@ -240,7 +240,7 @@ int sysControlDisplay (int digit, /* number of digit 0..7 */
return (0); return (0);
} }
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
#ifdef CFG_PCMCIA_MEM_ADDR #ifdef CFG_PCMCIA_MEM_ADDR
volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR; volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR;

View file

@ -772,7 +772,7 @@ exit:
return rc; return rc;
} }
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
int pcmcia_off (void) int pcmcia_off (void)
{ {
printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n"); printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n");

View file

@ -312,7 +312,7 @@ long int initdram (int board_type)
return (psize); return (psize);
} }
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) #if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr); extern void doc_probe (ulong physadr);
void doc_init (void) void doc_init (void)
{ {

View file

@ -321,7 +321,7 @@ long int initdram (int board_type)
return (psize); return (psize);
} }
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) #if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr); extern void doc_probe (ulong physadr);
void doc_init (void) void doc_init (void)
{ {

View file

@ -57,7 +57,7 @@ int dram_init (void)
} }
#ifdef CONFIG_DRIVER_ETHER #ifdef CONFIG_DRIVER_ETHER
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
/* /*
* Name: * Name:
@ -77,5 +77,5 @@ void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops)
p_phyops->AutoNegotiate = bcm5221_AutoNegotiate; p_phyops->AutoNegotiate = bcm5221_AutoNegotiate;
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_NET */ #endif
#endif /* CONFIG_DRIVER_ETHER */ #endif /* CONFIG_DRIVER_ETHER */