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>
18 years ago · 77a318545d
parent 068b60a0eb
commit 77a318545d
26 changed files with 34 additions and 36 deletions
--- 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
--- 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
--- 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
 /*
--- 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
--- 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
--- 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)
--- 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)
--- 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
--- 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[];
--- 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)
--- 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>
--- 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
--- 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)
--- 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)
--- 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
--- a/board/evb64260/serial.c
+++ b/board/evb64260/serial.c
@ -182,4 +182,4 @@ kgdb_interruptible (int yes)
 {
 	return;
 }
-#endif	/* CFG_CMD_KGDB	*/
+#endif
--- 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
--- 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

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

--- 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	*/
--- 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

--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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