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 --- board/Marvell/common/serial.c | 2 +- board/amirix/ap1000/serial.c | 2 +- board/bc3450/bc3450.c | 4 ++-- board/bc3450/cmd_bc3450.c | 2 +- board/bf537-stamp/ether_bf537.c | 2 +- board/c2mon/pcmcia.c | 2 +- board/cpc45/cpc45.c | 2 +- board/emk/top5200/top5200.c | 4 ++-- board/esd/common/auto_update.c | 2 +- board/esd/cpci5200/cpci5200.c | 4 ++-- board/esd/cpci750/ide.c | 2 +- board/esd/cpci750/serial.c | 2 +- board/esd/mecp5200/mecp5200.c | 4 ++-- board/esd/pf5200/pf5200.c | 4 ++-- board/evb64260/eth.c | 2 +- board/evb64260/serial.c | 2 +- board/evb64260/zuma_pbb.c | 2 +- board/fads/fads.c | 2 +- board/fads/fads.h | 4 ++-- board/gen860t/gen860t.c | 2 +- board/genietv/genietv.c | 2 +- board/hymod/bsp.c | 4 +--- board/icecube/icecube.c | 4 ++-- board/icu862/pcmcia.c | 2 +- board/ids8247/ids8247.c | 2 +- board/inka4x0/inka4x0.c | 4 ++-- 26 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c index 392b4fd..01efbea 100644 --- a/board/Marvell/common/serial.c +++ b/board/Marvell/common/serial.c @@ -169,4 +169,4 @@ void kgdb_interruptible (int yes) { return; } -#endif /* CFG_CMD_KGDB */ +#endif diff --git a/board/amirix/ap1000/serial.c b/board/amirix/ap1000/serial.c index 1acbe9e..5e9e3a3 100644 --- a/board/amirix/ap1000/serial.c +++ b/board/amirix/ap1000/serial.c @@ -108,4 +108,4 @@ void kgdb_interruptible (int yes) { return; } -#endif /* CFG_CMD_KGDB */ +#endif diff --git a/board/bc3450/bc3450.c b/board/bc3450/bc3450.c index 05bb723..56a73fe 100644 --- a/board/bc3450/bc3450.c +++ b/board/bc3450/bc3450.c @@ -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 /* diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c index 664166a..1455953 100644 --- a/board/bc3450/cmd_bc3450.c +++ b/board/bc3450/cmd_bc3450.c @@ -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 diff --git a/board/bf537-stamp/ether_bf537.c b/board/bf537-stamp/ether_bf537.c index 58f4e4e..36c1536 100644 --- a/board/bf537-stamp/ether_bf537.c +++ b/board/bf537-stamp/ether_bf537.c @@ -542,4 +542,4 @@ int ether_post_test(int flags) return 0; } #endif -#endif /* CFG_CMD_NET */ +#endif diff --git a/board/c2mon/pcmcia.c b/board/c2mon/pcmcia.c index f096d4f..c389c67 100644 --- a/board/c2mon/pcmcia.c +++ b/board/c2mon/pcmcia.c @@ -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) diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c index c9dab78..79eb473 100644 --- a/board/cpc45/cpc45.c +++ b/board/cpc45/cpc45.c @@ -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) diff --git a/board/emk/top5200/top5200.c b/board/emk/top5200/top5200.c index d741e6b..ccbd72a 100644 --- a/board/emk/top5200/top5200.c +++ b/board/emk/top5200/top5200.c @@ -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 diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index f7ff3c9..62f6c20 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -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[]; diff --git a/board/esd/cpci5200/cpci5200.c b/board/esd/cpci5200/cpci5200.c index a925b84..adb8597 100644 --- a/board/esd/cpci5200/cpci5200.c +++ b/board/esd/cpci5200/cpci5200.c @@ -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) diff --git a/board/esd/cpci750/ide.c b/board/esd/cpci750/ide.c index bea99ce..01b90c6 100644 --- a/board/esd/cpci750/ide.c +++ b/board/esd/cpci750/ide.c @@ -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> diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c index 14494d2..e1af37e 100644 --- a/board/esd/cpci750/serial.c +++ b/board/esd/cpci750/serial.c @@ -104,4 +104,4 @@ void kgdb_interruptible (int yes) { return; } -#endif /* CFG_CMD_KGDB */ +#endif diff --git a/board/esd/mecp5200/mecp5200.c b/board/esd/mecp5200/mecp5200.c index c4b91e9..ea49f26 100644 --- a/board/esd/mecp5200/mecp5200.c +++ b/board/esd/mecp5200/mecp5200.c @@ -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) diff --git a/board/esd/pf5200/pf5200.c b/board/esd/pf5200/pf5200.c index 77e164b..48b80bf 100644 --- a/board/esd/pf5200/pf5200.c +++ b/board/esd/pf5200/pf5200.c @@ -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) diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c index 467c557..add2b3d 100644 --- a/board/evb64260/eth.c +++ b/board/evb64260/eth.c @@ -804,4 +804,4 @@ gt6426x_eth_initialize(bd_t *bis) }
} -#endif /* CFG_CMD_NET && CONFIG_NET_MULTI */ +#endif diff --git a/board/evb64260/serial.c b/board/evb64260/serial.c index dd73fa1..f1bcab3 100644 --- a/board/evb64260/serial.c +++ b/board/evb64260/serial.c @@ -182,4 +182,4 @@ kgdb_interruptible (int yes) { return; } -#endif /* CFG_CMD_KGDB */ +#endif diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c index c55d428..296e461 100644 --- a/board/evb64260/zuma_pbb.c +++ b/board/evb64260/zuma_pbb.c @@ -217,4 +217,4 @@ U_BOOT_CMD( " - init zuma mbox\n" );
-#endif /* CFG_CMD_BSP */ +#endif diff --git a/board/fads/fads.c b/board/fads/fads.c index 4e3669e..8f5736b 100644 --- a/board/fads/fads.c +++ b/board/fads/fads.c @@ -921,7 +921,7 @@ int pcmcia_init(void) return 0; }
-#endif /* CFG_CMD_PCMCIA */ +#endif
/* ========================================================================= */
diff --git a/board/fads/fads.h b/board/fads/fads.h index 7523781..c6f7ccd 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -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 */ diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c index 4bfdcac..d448f9f 100644 --- a/board/gen860t/gen860t.c +++ b/board/gen860t/gen860t.c @@ -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
diff --git a/board/genietv/genietv.c b/board/genietv/genietv.c index 52a57b7..c75507f 100644 --- a/board/genietv/genietv.c +++ b/board/genietv/genietv.c @@ -357,4 +357,4 @@ int pcmcia_init (void)
return 0; } -#endif /* CFG_CMD_PCMCIA */ +#endif diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c index 30a5051..12f1402 100644 --- a/board/hymod/bsp.c +++ b/board/hymod/bsp.c @@ -402,6 +402,4 @@ do_htest (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; }
-#endif /* CFG_CMD_BSP */ - -/* ------------------------------------------------------------------------- */ +#endif diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index 2960998..c027f6f 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -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 diff --git a/board/icu862/pcmcia.c b/board/icu862/pcmcia.c index 4a5cabb..11de183 100644 --- a/board/icu862/pcmcia.c +++ b/board/icu862/pcmcia.c @@ -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) diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c index daddbf9..19823a4 100644 --- a/board/ids8247/ids8247.c +++ b/board/ids8247/ids8247.c @@ -315,4 +315,4 @@ nand_init (void) printf ("%4lu MB\n", totlen >>20); }
-#endif /* CFG_CMD_NAND */ +#endif diff --git a/board/inka4x0/inka4x0.c b/board/inka4x0/inka4x0.c index d670cc3..478a331 100644 --- a/board/inka4x0/inka4x0.c +++ b/board/inka4x0/inka4x0.c @@ -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