board/[A-Za-i]*: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-10 10:39:10 -05:00
parent 068b60a0eb
commit 77a318545d
26 changed files with 34 additions and 36 deletions

View File

@ -169,4 +169,4 @@ void kgdb_interruptible (int yes)
{
return;
}
#endif /* CFG_CMD_KGDB */
#endif

View File

@ -108,4 +108,4 @@ void kgdb_interruptible (int yes)
{
return;
}
#endif /* CFG_CMD_KGDB */
#endif

View File

@ -294,7 +294,7 @@ void pci_init_board(void)
}
#endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void)
{
@ -315,7 +315,7 @@ void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#endif
#ifdef CONFIG_POST
/*

View File

@ -824,4 +824,4 @@ U_BOOT_CMD (test, 2, 1, cmd_test, "test - unit test routines\n", "\n"
"test unit-off\n"
" - turns off the BC3450 unit\n"
" WARNING: Unsaved environment variables will be lost!\n");
#endif /* CFG_CMD_BSP */
#endif

View File

@ -542,4 +542,4 @@ int ether_post_test(int flags)
return 0;
}
#endif
#endif /* CFG_CMD_NET */
#endif

View File

@ -193,7 +193,7 @@ int pcmcia_hardware_disable(int slot)
return (0);
}
#endif /* CFG_CMD_PCMCIA */
#endif
int pcmcia_voltage_set(int slot, int vcc, int vpp)

View File

@ -257,7 +257,7 @@ int pcmcia_init(void)
return rc;
}
#endif /* CFG_CMD_PCMCIA */
#endif
# ifdef CONFIG_IDE_LED
void ide_led (uchar led, uchar status)

View File

@ -184,7 +184,7 @@ void pci_init_board(void)
/*****************************************************************************
* provide the IDE Reset Function
*****************************************************************************/
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void)
{
@ -205,4 +205,4 @@ void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#endif

View File

@ -40,7 +40,7 @@
#ifdef CONFIG_AUTO_UPDATE
#if !defined(CONFIG_CMD_FAT)
#error "must define CFG_CMD_FAT"
#error "must define CONFIG_CMD_FAT"
#endif
extern au_image_t au_image[];

View File

@ -196,7 +196,7 @@ void pci_init_board(void) {
}
#endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
#if defined(CONFIG_CMD_IDE) && defined (CONFIG_IDE_RESET)
void init_ide_reset(void)
{
@ -217,7 +217,7 @@ void ide_set_reset(int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#endif
#define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)

View File

@ -25,7 +25,7 @@
#include <common.h>
#ifdef CFG_CMD_IDE
#if defined(CONFIG_CMD_IDE)
#include <ata.h>
#include <ide.h>
#include <pci.h>

View File

@ -104,4 +104,4 @@ void kgdb_interruptible (int yes)
{
return;
}
#endif /* CFG_CMD_KGDB */
#endif

View File

@ -196,7 +196,7 @@ void pci_init_board(void)
}
#endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
#define GPIO_PSC1_4 0x01000000UL
@ -218,7 +218,7 @@ void ide_set_reset(int idereset)
else
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#endif
#define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)

View File

@ -196,7 +196,7 @@ void pci_init_board(void) {
}
#endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset(void)
{
@ -217,7 +217,7 @@ void ide_set_reset(int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#endif
#define MPC5XXX_SIMPLEIO_GPIO_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)

View File

@ -804,4 +804,4 @@ gt6426x_eth_initialize(bd_t *bis)
}
}
#endif /* CFG_CMD_NET && CONFIG_NET_MULTI */
#endif

View File

@ -182,4 +182,4 @@ kgdb_interruptible (int yes)
{
return;
}
#endif /* CFG_CMD_KGDB */
#endif

View File

@ -217,4 +217,4 @@ U_BOOT_CMD(
" - init zuma mbox\n"
);
#endif /* CFG_CMD_BSP */
#endif

View File

@ -921,7 +921,7 @@ int pcmcia_init(void)
return 0;
}
#endif /* CFG_CMD_PCMCIA */
#endif
/* ========================================================================= */

View File

@ -250,7 +250,7 @@
*/
#define CFG_JFFS2_SORT_FRAGMENTS
#endif /* CFG_CMD_JFFS2 */
#endif
/*-----------------------------------------------------------------------
* Cache Configuration
@ -479,7 +479,7 @@
#define CONFIG_ISO_PARTITION 1
#undef CONFIG_ATAPI
#if 0 /* does not make sense when CFG_CMD_IDE is not enabled, too */
#if 0 /* does not make sense when CONFIG_CMD_IDE is not enabled, too */
#define CONFIG_IDE_8xx_PCCARD 1 /* Use IDE with PC Card Adapter */
#endif
#undef CONFIG_IDE_8xx_DIRECT /* Direct IDE not supported */

View File

@ -36,7 +36,7 @@ DECLARE_GLOBAL_DATA_PTR;
#include <status_led.h>
#endif
#if defined(CFG_CMD_MII) && defined(CONFIG_MII)
#if defined(CONFIG_CMD_MII) && defined(CONFIG_MII)
#include <net.h>
#endif

View File

@ -357,4 +357,4 @@ int pcmcia_init (void)
return 0;
}
#endif /* CFG_CMD_PCMCIA */
#endif

View File

@ -402,6 +402,4 @@ do_htest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 0;
}
#endif /* CFG_CMD_BSP */
/* ------------------------------------------------------------------------- */
#endif

View File

@ -359,7 +359,7 @@ void pci_init_board(void)
}
#endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void)
{
@ -384,7 +384,7 @@ void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#endif
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
void

View File

@ -183,7 +183,7 @@ int pcmcia_hardware_disable(int slot)
return (0);
}
#endif /* CFG_CMD_PCMCIA */
#endif
int pcmcia_voltage_set(int slot, int vcc, int vpp)

View File

@ -315,4 +315,4 @@ nand_init (void)
printf ("%4lu MB\n", totlen >>20);
}
#endif /* CFG_CMD_NAND */
#endif

View File

@ -236,7 +236,7 @@ void pci_init_board(void)
}
#endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void)
{
@ -261,4 +261,4 @@ void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#endif