diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c
index 392b4fda266a0d2f629a90020886a257651be935..01efbea77b195c80e842625363e6ba96df48c325 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 1acbe9e12af28573c0b5cb142c5b098321e4c387..5e9e3a31eeae14c18a4a1c11406ef64aa29569a2 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 05bb7235f8bf4799fe7e7acd490a761f818c6a2a..56a73fe4d0c7acf84ef632e85ac6d2b27ab81002 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 664166a6d7c79173e1ffdfdc3039b712ec023919..1455953078b8b6b43d6f127cba4ac0afe2415409 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 58f4e4e4cdb399974d4e57092a1df752d0a5afc5..36c1536e39fe4787a87ffb313897fc5be7837c5e 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 f096d4f10d2522fd37d46c6faa2deb1b8b78c512..c389c6778bebd4a8d7c73c20140dd606846055f8 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 c9dab78090e16d27025a1e94e6f4f0680768c3a7..79eb47317621dfa3f2a39f7246822e8a36b7d717 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 d741e6b5cef9400a0f8006a33cd27b2cb1aa5018..ccbd72a79b5b7e883842f4966e10529a1002cd80 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 f7ff3c96faf0be3388b6ce68550a9584b29ec835..62f6c204340bc00c5ea2dd52ab1bfc437273561b 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 a925b84fd9e5e07d78f468761be249314fa4e98d..adb8597e1cf70096d29bcda40fac575711628078 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 bea99ce8e721b13e2b33ea04c5179fab75789c48..01b90c631dd3d51cbea969d7a017571bf0a21745 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 14494d2d10644276f803166cb93bcbdf0e2c2933..e1af37e1d8ac2ff49b9aff5994835ad01920ae05 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 c4b91e950bc86928f3cd5bf08d50480e904d4ee1..ea49f264ab866e531df16f7e391dc585a85b9459 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 77e164bd18d5d6e42c3c63f0332aff0a5e0da0eb..48b80bfc5fb8d07e27f62fc6ce2c20d431480a8b 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 467c557337ac27e94bcb63adcfa2b4928340b642..add2b3df534c379a3a064f42d6c32c75998683a5 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 dd73fa1c1b8b246f46c1eb038ebd7c6a64a803b4..f1bcab3f0056d920e4f75614facf6a26d1f8fe6e 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 c55d428f227a6ba4d1bb745d68306bcb32142b03..296e4619c9a31c10692c691f2d24ecd54d257be6 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 4e3669ed97a535fb14b968e2f522441c8a87a4ff..8f5736b4141a08d3094fda521e759e3c884525e4 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 75237818cefe3846fb25306ba5aa6e1e71bebb85..c6f7ccde077411b0f4dcb977b242d0b9903ba073 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 4bfdcac0dac734d9fc225437fcec0f6e724c7a1c..d448f9fa33dc92540a04fb47d6b20eed2fc3f4d0 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 52a57b7ea68c58461a7957bf55bf8ff88458f26b..c75507f61d4167b046742e7004ffe164ce4ffd73 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 30a5051bec4f4fd9ceaf463d231f0c7fe80f315b..12f14020172f3b03c58654585c6388719656920c 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 296099843421a0e489e47ffd843b75840b4d07fe..c027f6f34e61dad7107faf8c723cc83d5367182c 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 4a5cabb871508eb6a462f7e8502182065a00c590..11de18317d1dc704a2332d2ff6055937ccb1f27e 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 daddbf901337d9d8afdb76e349c2890fcced9906..19823a474ed09f1c831cefbd260fab9c6d1e70af 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 d670cc35a003e0790ae566eb7e3fc0ede7faf76f..478a331b408e01007078c2a66ded3f4ed6cfc7ce 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