GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/Marvell/common/serial.c
View file

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

2
board/amirix/ap1000/serial.c
View file

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

4
board/bc3450/bc3450.c
View file

@ -294,7 +294,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void) 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; *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
} }
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif
#ifdef CONFIG_POST #ifdef CONFIG_POST
/* /*

2
board/bc3450/cmd_bc3450.c
View file

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

2
board/bf537-stamp/ether_bf537.c
View file

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

2
board/c2mon/pcmcia.c
View file

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

2
board/cpc45/cpc45.c
View file

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

4
board/emk/top5200/top5200.c
View file

@ -184,7 +184,7 @@ void pci_init_board(void)
/***************************************************************************** /*****************************************************************************
* provide the IDE Reset Function * 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) 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; *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
} }
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif

2
board/esd/common/auto_update.c
View file

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

4
board/esd/cpci5200/cpci5200.c
View file

@ -196,7 +196,7 @@ void pci_init_board(void) {
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined (CONFIG_IDE_RESET)
void init_ide_reset(void) 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; *(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_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C) #define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)

2
board/esd/cpci750/ide.c
View file

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

2
board/esd/cpci750/serial.c
View file

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

4
board/esd/mecp5200/mecp5200.c
View file

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

4
board/esd/pf5200/pf5200.c
View file

@ -196,7 +196,7 @@ void pci_init_board(void) {
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset(void) 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; *(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_ENABLE (MPC5XXX_GPIO + 0x0004)
#define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C) #define MPC5XXX_SIMPLEIO_GPIO_DIR (MPC5XXX_GPIO + 0x000C)

2
board/evb64260/eth.c
View file

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

2
board/evb64260/serial.c
View file

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

2
board/evb64260/zuma_pbb.c
View file

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

2
board/fads/fads.c
View file

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

4
board/fads/fads.h
View file

@ -250,7 +250,7 @@
*/ */
#define CFG_JFFS2_SORT_FRAGMENTS #define CFG_JFFS2_SORT_FRAGMENTS
#endif /* CFG_CMD_JFFS2 */ #endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Cache Configuration * Cache Configuration
@ -479,7 +479,7 @@
#define CONFIG_ISO_PARTITION 1 #define CONFIG_ISO_PARTITION 1
#undef CONFIG_ATAPI #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 */ #define CONFIG_IDE_8xx_PCCARD 1 /* Use IDE with PC Card Adapter */
#endif #endif
#undef CONFIG_IDE_8xx_DIRECT /* Direct IDE not supported */ #undef CONFIG_IDE_8xx_DIRECT /* Direct IDE not supported */

2
board/gen860t/gen860t.c
View file

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

2
board/genietv/genietv.c
View file

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

4
board/hymod/bsp.c
View file

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

4
board/icecube/icecube.c
View file

@ -359,7 +359,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void) 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; *(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) #if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
void void

2
board/icu862/pcmcia.c
View file

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

2
board/ids8247/ids8247.c
View file

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

4
board/inka4x0/inka4x0.c
View file

@ -236,7 +236,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void) 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; *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
} }
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif