diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c
index 04fda4a69f1bbd9e2bf9f25daecb33d4ead78e42..b2274875e5158f3a7464ba4f646bfada354315a9 100644
--- a/board/jupiter/jupiter.c
+++ b/board/jupiter/jupiter.c
@@ -281,7 +281,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)
{
@@ -306,7 +306,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/kup/common/pcmcia.c b/board/kup/common/pcmcia.c
index b00f794631be712ddae1bff1e99cfb56ff7ccb40..def38f1c687793a8726b8246c1770e470f4176b4 100644
--- a/board/kup/common/pcmcia.c
+++ b/board/kup/common/pcmcia.c
@@ -144,7 +144,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/lwmon/lwmon.c b/board/lwmon/lwmon.c
index bb0ab552e080e1911a189f073c46e6ed05fca33a..c68978aa984bb416a8db8e36f7b1da008a4e9436 100644
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -960,7 +960,7 @@ U_BOOT_CMD(
"lsb - print current setting\n"
);
-#endif /* CFG_CMD_BSP */
+#endif
/*----------------------------- Utilities -----------------------------*/
/***********************************************************************
diff --git a/board/lwmon/pcmcia.c b/board/lwmon/pcmcia.c
index fbab904d6132eef011ceca512e29d0367b66a99f..ebca7a2ca121f75a6f32f63e97d8190311755e75 100644
--- a/board/lwmon/pcmcia.c
+++ b/board/lwmon/pcmcia.c
@@ -166,7 +166,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/mcc200/auto_update.c b/board/mcc200/auto_update.c
index 1df63174a5b36a54e4ac4e9aa0a72169528dc110..6044565ff043fac540d9c11437dd85cbb6bc3920 100644
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -45,7 +45,7 @@
#endif
#if !defined(CONFIG_CMD_FAT)
-#error "must define CFG_CMD_FAT"
+#error "must define CONFIG_CMD_FAT"
#endif
#undef AU_DEBUG
diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 573db02768091b01537f5ec9afc2fff912fa9c96..a4c4644b4c003513c9abc64ba341d937c1045b6b 100644
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -307,7 +307,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)
{
@@ -320,7 +320,7 @@ void ide_set_reset (int idereset)
debug ("ide_reset(%d)\n", idereset);
}
-#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
#if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
diff --git a/board/netta/pcmcia.c b/board/netta/pcmcia.c
index 693e077b3a1be658a6b86672a17141c5620a33f8..86b3cfb992bc8d0b4be23fa5bead1c83f267ae9f 100644
--- a/board/netta/pcmcia.c
+++ b/board/netta/pcmcia.c
@@ -291,7 +291,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/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index 6a37e2fdb16c4c11466817fd3f8608fef1930781..1148c6aa273d814501f772917d11469db8ce5d43 100644
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -241,5 +241,5 @@ U_BOOT_CMD(
"wd - print current status\n"
);
-#endif /* CFG_CMD_BSP */
+#endif
#endif /* CONFIG_WATCHDOG */
diff --git a/board/pm520/pm520.c b/board/pm520/pm520.c
index 1714e355d0e2db9e980bb6419102690851bd3404..14c3f1d442f0c1d0e06df7ae08053d84dc4016bb 100644
--- a/board/pm520/pm520.c
+++ b/board/pm520/pm520.c
@@ -299,7 +299,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)
{
@@ -312,7 +312,7 @@ void ide_set_reset (int idereset)
debug ("ide_reset(%d)\n", idereset);
}
-#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
#if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
diff --git a/board/r360mpi/pcmcia.c b/board/r360mpi/pcmcia.c
index c5e39909868596206faea25e90c9d351767cddb8..a83ca8da4727c97d37fbf2c80eae73d99cd53837 100644
--- a/board/r360mpi/pcmcia.c
+++ b/board/r360mpi/pcmcia.c
@@ -150,7 +150,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/sacsng/sacsng.c b/board/sacsng/sacsng.c
index 208f21e18120e91508269fe05ffbb150b96b28c3..25209e0546404c6a097691db9fbb52dbf31bcec9 100644
--- a/board/sacsng/sacsng.c
+++ b/board/sacsng/sacsng.c
@@ -873,7 +873,7 @@ spi_chipsel_type spi_chipsel[] = {
};
int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
-#endif /* CFG_CMD_SPI */
+#endif
#endif /* CONFIG_MISC_INIT_R */
diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c
index 6c37445cd88c3d9abb3f83bddfcb189480d515fb..2309069a606dac43241002fbc0365b2362e75ce8 100644
--- a/board/siemens/pcu_e/pcu_e.c
+++ b/board/siemens/pcu_e/pcu_e.c
@@ -408,7 +408,7 @@ U_BOOT_CMD (puma, 4, 1, do_puma,
"status - print PUMA status\n"
"puma load addr len - load PUMA configuration data\n");
-#endif /* CFG_CMD_BSP */
+#endif
/* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */
diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c
index 41c74f6a67e3df42ee50cb04f7d239b079d3aff8..798e1855bd4902028b093f4841a1cab29ef7a7fa 100644
--- a/board/sixnet/sixnet.c
+++ b/board/sixnet/sixnet.c
@@ -77,7 +77,7 @@ int checkboard (void)
#if defined(CONFIG_CMD_PCMCIA)
#error "SXNI855T has no PCMCIA port"
-#endif /* CFG_CMD_PCMCIA */
+#endif
/* ------------------------------------------------------------------------- */
diff --git a/board/ssv/adnpesc1/adnpesc1.c b/board/ssv/adnpesc1/adnpesc1.c
index 8edbd70ed132087922a3bc85a9cf8be5998195ab..2ec3a728d74ea5cb0a5ce9c43e60ecf57d48bd53 100644
--- a/board/ssv/adnpesc1/adnpesc1.c
+++ b/board/ssv/adnpesc1/adnpesc1.c
@@ -89,7 +89,7 @@ spi_chipsel_type spi_chipsel[] = {
};
int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
-#endif /* CFG_CMD_SPI */
+#endif
#if defined(CONFIG_POST)
/*
diff --git a/board/ssv/common/cmd_sled.c b/board/ssv/common/cmd_sled.c
index 8cdf45ab0dd38181bb415ca4f5e04b0e90fe0a0a..713ed65568cdf088bd48dfe3e63d4e04233b4756 100644
--- a/board/ssv/common/cmd_sled.c
+++ b/board/ssv/common/cmd_sled.c
@@ -158,5 +158,5 @@ int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD (sled, 3, 0, do_sled,
"sled - check and set status led\n",
"sled [name [state]]\n" __NAME_STR " - state: on|off|blink\n");
-#endif /* CFG_CMD_BSP */
+#endif
#endif /* CONFIG_STATUS_LED */
diff --git a/board/ssv/common/wd_pio.c b/board/ssv/common/wd_pio.c
index 69e9ed7a74bd784e7b0d3359ffcb5efb510ff0ee..9945c5987e1cc434c59492042c0630020cb1a123 100644
--- a/board/ssv/common/wd_pio.c
+++ b/board/ssv/common/wd_pio.c
@@ -156,5 +156,5 @@ U_BOOT_CMD(
"wd off - switch watchdog off\n"
"wd - print current status\n"
);
-#endif /* CFG_CMD_BSP */
+#endif
#endif /* CONFIG_HW_WATCHDOG */
diff --git a/board/total5200/total5200.c b/board/total5200/total5200.c
index 1a35187260a30f274036402ae668e9519ccd47cd..f32dadf5a2cc1900a89cf233d21932da4ffc0873 100644
--- a/board/total5200/total5200.c
+++ b/board/total5200/total5200.c
@@ -109,7 +109,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)
/* IRDA_1 aka PSC6_3 (pin C13) */
#define GPIO_IRDA_1 0x20000000UL
@@ -133,7 +133,7 @@ void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_GPIO_DATA_O |= GPIO_IRDA_1;
}
}
-#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
#ifdef CONFIG_VIDEO_SED13806
#include <sed13806.h>
diff --git a/board/tqm5200/cmd_stk52xx.c b/board/tqm5200/cmd_stk52xx.c
index 802332f7097f8244d8e262f7a9987f0b2a132348..b746679afaa0561729c4fdd56ffff332d2499d9c 100644
--- a/board/tqm5200/cmd_stk52xx.c
+++ b/board/tqm5200/cmd_stk52xx.c
@@ -1241,4 +1241,4 @@ U_BOOT_CMD(
" - loopback plug(s) for X21/X22 required\n"
);
#endif
-#endif /* CFG_CMD_BSP */
+#endif
diff --git a/board/tqm5200/cmd_tb5200.c b/board/tqm5200/cmd_tb5200.c
index cd141c172a2971f8f6228247e37f9bcd59e70863..214dca65e534c2c97ac12ae8f4a87b356179697f 100644
--- a/board/tqm5200/cmd_tb5200.c
+++ b/board/tqm5200/cmd_tb5200.c
@@ -101,4 +101,4 @@ U_BOOT_CMD(
);
#endif /* CONFIG_STK52XX */
-#endif /* CFG_CMD_BSP */
+#endif
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c
index cf97603afc5295fa9faae21a784140f90ecb4835..51f4aebc06e0b46a990ab14003d4a75554f766fe 100644
--- a/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@ -336,7 +336,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)
#if defined (CONFIG_MINIFAP)
#define SM501_POWER_MODE0_GATE 0x00000040UL
@@ -389,7 +389,7 @@ void ide_set_reset (int idereset)
}
#endif
}
-#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
#ifdef CONFIG_POST
/*
diff --git a/board/tqm8272/tqm8272.c b/board/tqm8272/tqm8272.c
index 653b7a9f4c7330fb6b41f7afcaedc1c8954b2ec2..7bd64012c4ba35a757ad2fe73e190c791b497b34 100644
--- a/board/tqm8272/tqm8272.c
+++ b/board/tqm8272/tqm8272.c
@@ -1212,7 +1212,7 @@ int board_nand_init(struct nand_chip *nand)
return 0;
}
-#endif /* CFG_CMD_NAND */
+#endif
#ifdef CONFIG_PCI
struct pci_controller hose;
diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c
index ad88867438358a45e452195a3c1fb5c2904809f3..ef40c5474857a608ced29b27c4f7827ff7eccd46 100644
--- a/board/trab/auto_update.c
+++ b/board/trab/auto_update.c
@@ -47,7 +47,7 @@
#endif
#if !defined(CONFIG_CMD_FAT)
-#error "must define CFG_CMD_FAT"
+#error "must define CONFIG_CMD_FAT"
#endif
/*
diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c
index 2db6a34b8bd1f5189bc9685aa22a6cc31b602db4..daa6aeefc73f5a6b0bc8d3b974ea8fca07416e49 100644
--- a/board/trab/cmd_trab.c
+++ b/board/trab/cmd_trab.c
@@ -893,4 +893,4 @@ U_BOOT_CMD(
" For each measurment a timestamp is printeted\n"
);
-#endif /* CFG_CMD_BSP */
+#endif
diff --git a/board/trab/trab_fkt.c b/board/trab/trab_fkt.c
index 56a80ff4cdd8a83254ecbb8f77f5f67e1ab86151..7273ef97b659a7bf55f20fb74d6f6abd2d0ed754 100644
--- a/board/trab/trab_fkt.c
+++ b/board/trab/trab_fkt.c
@@ -155,7 +155,7 @@ int i2c_write_multiple (uchar chip, uint addr, int alen, uchar *buffer,
int len);
int i2c_read_multiple ( uchar chip, uint addr, int alen, uchar *buffer,
int len);
-#endif /* CFG_CMD_I2C */
+#endif
/*
* TRAB board specific commands. Especially commands for burn-in and function
@@ -1019,10 +1019,10 @@ static int touch_write_clibration_values (int calib_point, int x, int y)
}
return 1;
#else
- printf ("No I2C support enabled (CFG_CMD_I2C), could not write "
+ printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n");
return (1);
-#endif /* CFG_CMD_I2C */
+#endif
}
@@ -1130,10 +1130,10 @@ int do_serial_number (char **argv)
printf ("%s: unknown command %s\n", __FUNCTION__, argv[2]);
return (1); /* unknown command, return error */
#else
- printf ("No I2C support enabled (CFG_CMD_I2C), could not write "
+ printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n");
return (1);
-#endif /* CFG_CMD_I2C */
+#endif
}
@@ -1160,10 +1160,10 @@ int do_crc16 (void)
}
return (0);
#else
- printf ("No I2C support enabled (CFG_CMD_I2C), could not write "
+ printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n");
return (1);
-#endif /* CFG_CMD_I2C */
+#endif
}
@@ -1272,10 +1272,10 @@ int do_eeprom (char **argv)
printf ("%s: invalid parameter %s\n", __FUNCTION__, argv[2]);
return (1);
#else
- printf ("No I2C support enabled (CFG_CMD_I2C), could not write "
+ printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n");
return (1);
-#endif /* CFG_CMD_I2C */
+#endif
}
#if defined(CONFIG_CMD_I2C)
@@ -1408,4 +1408,4 @@ int i2c_read_multiple ( uchar chip, uint addr, int alen,
}
return (0);
}
-#endif /* CFG_CMD_I2C */
+#endif
diff --git a/board/uc100/pcmcia.c b/board/uc100/pcmcia.c
index 74d29b96600c19d8e7dede3405461b22ebcb006e..407bdb73c6fa5bab26d7ee489eaecfee82fa31f9 100644
--- a/board/uc100/pcmcia.c
+++ b/board/uc100/pcmcia.c
@@ -149,7 +149,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/v38b/v38b.c b/board/v38b/v38b.c
index ace4aa2caed9f437df82d1571827de84b4465304..ec032eef8ded81c90a539de5e3608c7c10f49232 100644
--- a/board/v38b/v38b.c
+++ b/board/v38b/v38b.c
@@ -224,7 +224,7 @@ int board_early_init_r(void)
}
-#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET)
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset(void)
{
debug("init_ide_reset\n");
@@ -248,7 +248,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
#ifdef CONFIG_HW_WATCHDOG
diff --git a/board/xilinx/ml300/serial.c b/board/xilinx/ml300/serial.c
index 09a3dc304d2753a4ed2feb02aafc4f1a18678d88..ba41f856e4aacda6bd44f62c348a7a735d2dd5ff 100644
--- a/board/xilinx/ml300/serial.c
+++ b/board/xilinx/ml300/serial.c
@@ -151,4 +151,4 @@ kgdb_interruptible(int yes)
{
return;
}
-#endif /* CFG_CMD_KGDB */
+#endif