common/: 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>

diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c
index 606fb9a1fc4fb4d48121ae11461ec4d4ea1ce296..a6038a6effd8a3a7c89ea33ea580f29edb42df38 100644 (file)
--- a/common/cmd_autoscript.c
+++ b/common/cmd_autoscript.c
@@ -149,7 +149,8 @@ autoscript (ulong addr)
        return rcode;
 }
 
-#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
+#endif
+
 /**************************************************/
 #if defined(CONFIG_CMD_AUTOSCRIPT)
 int
@@ -176,6 +177,6 @@ U_BOOT_CMD(
        "[addr] - run script starting at addr"
        " - A valid autoscr header must be present\n"
 );
-#endif /* CFG_CMD_AUTOSCRIPT */
+#endif
 
-#endif /* CFG_CMD_AUTOSCRIPT */
+#endif

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 55cb10004427e9f01bfca57ffbaf631592480b3e..ccb826b8ab9dafbbd65371370a75858a25453f48 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -167,7 +167,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        print_num ("sram size",         (ulong)bd->bi_sramsize);
 #endif
 
-#if defined(CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
        puts ("ethaddr     =");
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@ -195,7 +195,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        print_num ("sram start     ",   (ulong)bd->bi_sramstart);
        print_num ("sram size      ",   (ulong)bd->bi_sramsize);
 #endif
-#if defined(CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
        puts ("ethaddr     =");
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@ -285,4 +285,4 @@ U_BOOT_CMD(
        "bdinfo  - print Board Info structure\n",
        NULL
 );
-#endif /* CFG_CMD_BDI */
+#endif

diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 0bd622bfd5d36d4b64d9d14029d3075f444f86fb..1c3547a1fcc680247d4401c244d7ef55b4f22916 100644 (file)
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -413,7 +413,7 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
            "rdump   - Show registers.\n", " - Show registers.\n");
 /* ====================================================================== */
-#endif /* CFG_CMD_BEDBUG */
+#endif
 
 
 /*

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 90de6b19a16122266ff4db12b90b4850b770ca48..c371f0e86436affca804eedc0ea75a32fb7c06fd 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -138,7 +138,7 @@ static boot_os_Fcn do_bootm_vxworks;
 static boot_os_Fcn do_bootm_qnxelf;
 int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
 int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
-#endif /* CFG_CMD_ELF */
+#endif
 #if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
 static boot_os_Fcn do_bootm_artos;
 #endif
@@ -449,7 +449,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
            do_bootm_qnxelf (cmdtp, flag, argc, argv,
                              addr, len_ptr, verify);
            break;
-#endif /* CFG_CMD_ELF */
+#endif
 #ifdef CONFIG_ARTOS
        case IH_OS_ARTOS:
            do_bootm_artos  (cmdtp, flag, argc, argv,
@@ -1315,7 +1315,7 @@ U_BOOT_CMD(
        "      image contents (magic number, header and payload checksums)\n"
 );
 
-#endif /* CFG_CMD_IMI */
+#endif
 
 #if defined(CONFIG_CMD_IMLS)
 /*-----------------------------------------------------------------------
@@ -1373,7 +1373,7 @@ U_BOOT_CMD(
        "    - Prints information about all images found at sector\n"
        "      boundaries in flash.\n"
 );
-#endif /* CFG_CMD_IMLS */
+#endif
 
 void
 print_image_hdr (image_header_t *hdr)
@@ -1389,7 +1389,7 @@ print_image_hdr (image_header_t *hdr)
        printf ("   Created:      %4d-%02d-%02d  %2d:%02d:%02d UTC\n",
                tm.tm_year, tm.tm_mon, tm.tm_mday,
                tm.tm_hour, tm.tm_min, tm.tm_sec);
-#endif /* CFG_CMD_DATE, CONFIG_TIMESTAMP */
+#endif
        puts ("   Image Type:   "); print_type(hdr);
        printf ("\n   Data Size:    %d Bytes = ", ntohl(hdr->ih_size));
        print_size (ntohl(hdr->ih_size), "\n");
@@ -1614,7 +1614,7 @@ do_bootm_qnxelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        local_args[1] = str;    /* and provide it via the arguments */
        do_bootelf(cmdtp, 0, 2, local_args);
 }
-#endif /* CFG_CMD_ELF */
+#endif
 
 #ifdef CONFIG_LYNXKDI
 static void

diff --git a/common/cmd_cache.c b/common/cmd_cache.c
index 6890fafc306e8c023010f39d06046cd50fbad728..675d43fa1877cc8320d3684b17caaf6cf23b295f 100644 (file)
--- a/common/cmd_cache.c
+++ b/common/cmd_cache.c
@@ -109,4 +109,4 @@ U_BOOT_CMD(
        "    - enable or disable data (writethrough) cache\n"
 );
 
-#endif /* CFG_CMD_CACHE */
+#endif

diff --git a/common/cmd_console.c b/common/cmd_console.c
index 530e3453c74c5277f07b34c84eab639159991d05..5e0f990723b371c013fe315af27811db812fc2e4 100644 (file)
--- a/common/cmd_console.c
+++ b/common/cmd_console.c
@@ -68,4 +68,4 @@ U_BOOT_CMD(
        ""
 );
 
-#endif /* CFG_CMD_CONSOLE */
+#endif

diff --git a/common/cmd_date.c b/common/cmd_date.c
index 93c2ca43dc54c4c3f6f6c56788446b461fd8a6ac..4a42534900a78c90ee6945874e437afa24ba5258 100644 (file)
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -211,4 +211,4 @@ U_BOOT_CMD(
        "  - with 'reset' argument: reset the RTC\n"
 );
 
-#endif /* CFG_CMD_DATE */
+#endif

diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index e79280c105a5f587767fe2daa46842bac45abbb7..12fa9db08d07bcd5037467c65f1f3d329beb503d 100644 (file)
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -246,4 +246,4 @@ U_BOOT_CMD(
        "adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
 );
 
-#endif /* CONFIG_4xx & CFG_CMD_SETGETDCR */
+#endif

diff --git a/common/cmd_diag.c b/common/cmd_diag.c
index 091e3c8a774d61184b88653669819c0627679b99..cb99b7700f7770dd8b014202544bb3e447231119 100644 (file)
--- a/common/cmd_diag.c
+++ b/common/cmd_diag.c
@@ -77,4 +77,4 @@ U_BOOT_CMD(
        "         - run specified tests\n"
 );
 
-#endif /* CFG_CMD_DIAG */
+#endif

diff --git a/common/cmd_display.c b/common/cmd_display.c
index 47ef35a1984a3a25b48bfe4bdc15061a2cf3bf37..d19f412819d2aba58a364122b8c714b6940bcba5 100644 (file)
--- a/common/cmd_display.c
+++ b/common/cmd_display.c
@@ -79,4 +79,4 @@ U_BOOT_CMD(
        "    - without arguments: clear dot matrix display\n"
 );
 
-#endif /* CFG_CMD_DISPLAY */
+#endif

diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index d6fb9ab748c3ffc8c9a295562a9631208afe124b..e5000e9ff399f43dc21ab1015592f7f9cacf2aed 100644 (file)
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -110,7 +110,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        printf ("Usage:\n%s\n", cmdtp->usage);
        return 1;
 }
-#endif /* CFG_CMD_EEPROM */
+#endif
 
 /*-----------------------------------------------------------------------
  *
@@ -422,7 +422,8 @@ void eeprom_init  (void)
 }
 /*-----------------------------------------------------------------------
  */
-#endif /* CFG_CMD_EEPROM */
+#endif
+
 /***************************************************/
 
 #if defined(CONFIG_CMD_EEPROM)
@@ -445,4 +446,4 @@ U_BOOT_CMD(
 );
 #endif /* CFG_I2C_MULTI_EEPROMS */
 
-#endif /* CFG_CMD_EEPROM */
+#endif

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 6d726193802bc09494fcd1c652c9353f8cbcfbd0..63a5593e4343ae16964f4cb369b00cedbeaff6c4 100644 (file)
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -324,4 +324,4 @@ U_BOOT_CMD(
        " [address] - load address of vxWorks ELF image.\n"
 );
 
-#endif /* CFG_CMD_ELF */
+#endif

diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index 0f0ff4a369a68a27d9981d648b8dcc6f9f70b323..54f0f9f9cec7f82a938888679212b9134d0c892a 100644 (file)
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -324,4 +324,4 @@ void hexdump (int cnt, unsigned char *data)
 }
 #endif /* NOT_IMPLEMENTED_YET */
 
-#endif /* CFG_CMD_FAT */
+#endif

diff --git a/common/cmd_flash.c b/common/cmd_flash.c
index e191f9ce4074a06077f2f28a098b2d8a117e6399..db38f94d03446ee241be46ece9c6b28530603d5c 100644 (file)
--- a/common/cmd_flash.c
+++ b/common/cmd_flash.c
@@ -732,4 +732,4 @@ U_BOOT_CMD(
 #undef TMP_PROT_ON
 #undef TMP_PROT_OFF
 
-#endif /* CFG_CMD_FLASH */
+#endif

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index 6aeeb84964a38f4f0538db6e63a6e7c1bf481314..a684a580e6edc24f54f057ad0a93de8d40659d95 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -877,7 +877,7 @@ int do_sdram  ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        return 0;
 }
-#endif /* CFG_CMD_SDRAM */
+#endif
 
 #if defined(CONFIG_I2C_CMD_TREE)
 #if defined(CONFIG_I2C_MULTI_BUS)
@@ -941,7 +941,7 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 #if defined(CONFIG_CMD_SDRAM)
        if (!strncmp(argv[1], "sd", 2))
                return do_sdram(cmdtp, flag, --argc, ++argv);
-#endif /* CFG_CMD_SDRAM */
+#endif
        else
                printf ("Usage:\n%s\n", cmdtp->usage);
        return 0;
@@ -967,7 +967,7 @@ U_BOOT_CMD(
        "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
 #if defined(CONFIG_CMD_SDRAM)
        "i2c sdram chip - print SDRAM configuration information\n"
-#endif  /* CFG_CMD_SDRAM */
+#endif
 );
 #endif /* CONFIG_I2C_CMD_TREE */
 U_BOOT_CMD(
@@ -1025,4 +1025,4 @@ U_BOOT_CMD(
 );
 #endif
 
-#endif /* CFG_CMD_I2C */
+#endif

diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index e211b161bd46ccd52892394e0817dfcada53bd9c..ae95758247d5e15cd26da5aca3b36ea45cdba7f8 100644 (file)
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -720,4 +720,4 @@ U_BOOT_CMD(
 );
 
 
-#endif /* CFG_CMD_IMMAP && (CONFIG_8xx || CONFIG_8260) */
+#endif

diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 777607a0ca110a336feed40185d20cbefcdede22..513a226c43113db0aea70df980b7464859883237 100644 (file)
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -2192,4 +2192,4 @@ U_BOOT_CMD(
 
 /***************************************************/
 
-#endif /* CFG_CMD_JFFS2 */
+#endif

diff --git a/common/cmd_load.c b/common/cmd_load.c
index d3d268158e8aec7d48312dd05fb9bb9d02e2cbce..204c3ebf1930ddbb3dcce843402e1a3be9a558f4 100644 (file)
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -43,10 +43,10 @@ static int read_record (char *buf, ulong len);
 # if defined(CONFIG_CMD_SAVES)
 static int save_serial (ulong offset, ulong size);
 static int write_record (char *buf);
-# endif /* CFG_CMD_SAVES */
+#endif
 
 static int do_echo = 1;
-#endif /* CFG_CMD_LOADS */
+#endif
 
 /* -------------------------------------------------------------------- */
 
@@ -399,9 +399,9 @@ write_record (char *buf)
        }
        return (0);
 }
-# endif /* CFG_CMD_SAVES */
+# endif
 
-#endif /* CFG_CMD_LOADS */
+#endif
 
 
 #if defined(CONFIG_CMD_LOADB)
@@ -1038,7 +1038,7 @@ static ulong load_serial_ymodem (ulong offset)
        return offset;
 }
 
-#endif /* CFG_CMD_LOADB */
+#endif
 
 /* -------------------------------------------------------------------- */
 
@@ -1084,8 +1084,8 @@ U_BOOT_CMD(
        "    - save S-Record file over serial line with offset 'off' and size 'size'\n"
 );
 #endif /* CFG_LOADS_BAUD_CHANGE */
-#endif /* CFG_CMD_SAVES */
-#endif /* CFG_CMD_LOADS */
+#endif
+#endif
 
 
 #if defined(CONFIG_CMD_LOADB)
@@ -1105,7 +1105,7 @@ U_BOOT_CMD(
        " with offset 'off' and baudrate 'baud'\n"
 );
 
-#endif /* CFG_CMD_LOADB */
+#endif
 
 /* -------------------------------------------------------------------- */
 
@@ -1135,4 +1135,4 @@ U_BOOT_CMD(
        "[on|off]\n - change RTS/CTS hardware flow control over serial line\n"
 );
 
-#endif /* CFG_CMD_HWFLOW */
+#endif

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 001dfa27d7f19b76eda976bb189567757ce6b8cd..a994211138665dff649b376ec69ef78fcf0deece 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -1253,4 +1253,4 @@ U_BOOT_CMD(
 #endif /* CONFIG_MX_CYCLIC */
 
 #endif
-#endif /* CFG_CMD_MEMORY */
+#endif

diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c
index b143dc291f79415d2d8ebbaa8740fd9be97bece4..8d4c1a38d7fcba45e840d7a7965643d8ec042284 100644 (file)
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -414,4 +414,4 @@ U_BOOT_CMD (rspr, 3, 1, do_rspr,
                " 1 - EAR - Exception address register\n"
                " 2 - ESR - Exception status register\n");
 
-#endif                         /* CONFIG_MICROBLAZE & CFG_CMD_MFSL */
+#endif

diff --git a/common/cmd_mii.c b/common/cmd_mii.c
index 120b8e804aebb216b72007dca71d387d8e5b8101..f6b98d1f3de7f6d50b61acb4a40c4156f69e7bde 100644 (file)
--- a/common/cmd_mii.c
+++ b/common/cmd_mii.c
@@ -595,4 +595,4 @@ U_BOOT_CMD(
 
 #endif /* CONFIG_TERSE_MII */
 
-#endif /* CFG_CMD_MII */
+#endif

diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index 4d5a2ff1df3ae07604489f3e0ade0be897d76348..c0c6b8f05af54ae683dcfd102514657e6863dda8 100644 (file)
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -69,4 +69,4 @@ U_BOOT_CMD(
        "    - delay execution for N seconds (N is _decimal_ !!!)\n"
 );
 
-#endif /* CFG_CMD_MISC */
+#endif

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index c772e9bc3bc930bcf4ed0bd7c7c78bbec38077a8..069c6d02a066ab5a6a010cd0c3df883cd8b1bfe4 100644 (file)
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -43,4 +43,4 @@ U_BOOT_CMD(
        NULL
 );
 
-#endif /* CFG_CMD_MMC */
+#endif

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 8f766c8dbb2761c0b98004700c160ea0e760b078..26efc6d20656a80c0f31aa2c052cca8b0eac0661 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -79,7 +79,7 @@ U_BOOT_CMD(
        "dhcp\t- invoke DHCP client to obtain IP/boot params\n",
        "\n"
 );
-#endif /* CFG_CMD_DHCP */
+#endif
 
 #if defined(CONFIG_CMD_NFS)
 int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -92,7 +92,7 @@ U_BOOT_CMD(
        "nfs\t- boot image via network using NFS protocol\n",
        "[loadAddress] [host ip addr:bootfilename]\n"
 );
-#endif /* CFG_CMD_NFS */
+#endif
 
 static void netboot_update_env (void)
 {
@@ -249,7 +249,7 @@ U_BOOT_CMD(
        "ping\t- send ICMP ECHO_REQUEST to network host\n",
        "pingAddress\n"
 );
-#endif /* CFG_CMD_PING */
+#endif
 
 #if defined(CONFIG_CMD_CDP)
 
@@ -292,7 +292,7 @@ U_BOOT_CMD(
        cdp,    1,      1,      do_cdp,
        "cdp\t- Perform CDP network configuration\n",
 );
-#endif /* CFG_CMD_CDP */
+#endif
 
 #if defined(CONFIG_CMD_SNTP)
 int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -330,6 +330,6 @@ U_BOOT_CMD(
        "sntp\t- synchronize RTC via network\n",
        "[NTP server IP]\n"
 );
-#endif /* CFG_CMD_SNTP */
+#endif
 
-#endif /* CFG_CMD_NET */
+#endif

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 68a2dc8bb9c2259ea8dcc86e19b14c684f03ab17..e313f2c4b6748d121a523b1a455939f729c04397 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -372,7 +372,7 @@ int _do_setenv (int flag, int argc, char *argv[])
                copy_filename (BootFile, argv[2], sizeof(BootFile));
                return 0;
        }
-#endif /* CFG_CMD_NET */
+#endif
 
 #ifdef CONFIG_AMIGAONEG3SE
        if (strcmp(argv[1], "vga_fg_color") == 0 ||
@@ -483,7 +483,7 @@ int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        /* Continue calling setenv code */
        return _do_setenv (flag, len, local_args);
 }
-#endif /* CFG_CMD_ASKENV */
+#endif
 
 /************************************************************************
  * Look up variable from environment,
@@ -603,7 +603,7 @@ U_BOOT_CMD(
        NULL
 );
 
-#endif /* CFG_CMD_ENV */
+#endif
 
 #if defined(CONFIG_CMD_ASKENV)
 
@@ -620,7 +620,7 @@ U_BOOT_CMD(
        "    - display 'message' string and get environment variable 'name'"
        "from stdin (max 'size' chars)\n"
 );
-#endif /* CFG_CMD_ASKENV */
+#endif
 
 #if defined(CONFIG_CMD_RUN)
 int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
@@ -630,4 +630,4 @@ U_BOOT_CMD(
        "var [...]\n"
        "    - run the commands in the environment variable(s) 'var'\n"
 );
-#endif  /* CFG_CMD_RUN */
+#endif

diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index ad6656a7e977833280018640b98b49789e821bf5..bfe33e3a8cbd5f0166dcf4bf29fc4fcd568695b9 100644 (file)
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -166,4 +166,4 @@ U_BOOT_CMD(
        "    - read datum from IO port\n"
 );
 
-#endif /* CFG_CMD_PORTIO */
+#endif

diff --git a/common/cmd_spi.c b/common/cmd_spi.c
index d446fe50586706c5f9585b9ab30779d618577d8f..3118d279b97dcea25658f561b06d6b1bfde7ff29 100644 (file)
--- a/common/cmd_spi.c
+++ b/common/cmd_spi.c
@@ -140,4 +140,4 @@ U_BOOT_CMD(
        "<dout>    - Hexadecimal string that gets sent\n"
 );
 
-#endif /* CFG_CMD_SPI */
+#endif

diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c
index 6fc06247bcbd706def785f2178a2d1fcc9211a90..29c349dab9c5d21e59dcb084c15cf7e505803b02 100644 (file)
--- a/common/cmd_vfd.c
+++ b/common/cmd_vfd.c
@@ -73,7 +73,7 @@ U_BOOT_CMD(
        "vfd ADDR\n"
        "    - load bitmap at address ADDR\n"
 );
-#endif /* CFG_CMD_VFD */
+#endif
 
 #ifdef CONFIG_VFD
 int trab_vfd (ulong bitmap)

diff --git a/common/command.c b/common/command.c
index 361ca62f42b9cbc48f7e6b533c4f748c04232bcc..af2f8cbf7b8c163e74dc8530d89c50f67dc82665 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -76,7 +76,7 @@ U_BOOT_CMD(
        "    - echo args to console; \\c suppresses newline\n"
 );
 
-#endif /*  CFG_CMD_ECHO */
+#endif
 
 #ifdef CFG_HUSH_PARSER
 

diff --git a/common/env_flash.c b/common/env_flash.c
index 3b6c34d9e856c9497064e281f619a6772da420bf..7a37e550deb8f90bff6518bebbf3666e079dcf4f 100644 (file)
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
 #define CMD_SAVEENV
 #elif defined(CFG_ENV_ADDR_REDUND)
-#error Cannot use CFG_ENV_ADDR_REDUND without CFG_CMD_ENV & CFG_CMD_FLASH
+#error Cannot use CFG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
 #endif
 
 #if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND < CFG_ENV_SIZE)

diff --git a/common/env_nand.c b/common/env_nand.c
index c8a80e0df12e058375d7585be68957fd9fa64ba8..38a07f8993f7ab1226044ed2497f05788ee9bfc5 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -42,7 +42,7 @@
 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
 #define CMD_SAVEENV
 #elif defined(CFG_ENV_OFFSET_REDUND)
-#error Cannot use CFG_ENV_OFFSET_REDUND without CFG_CMD_ENV & CFG_CMD_NAND
+#error Cannot use CFG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
 #endif
 
 #if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND != CFG_ENV_SIZE)

diff --git a/common/hush.c b/common/hush.c
index bb6585e9acf23000acd386abfcc5147a27e5eaa8..582635c04c70621b2c94b3b1265e201f8d172313 100644 (file)
--- a/common/hush.c
+++ b/common/hush.c
@@ -1694,7 +1694,7 @@ static int run_pipe_real(struct pipe *pi)
                                else
                                        flag |= CMD_FLAG_BOOTD;
                                }
-#endif /* CFG_CMD_BOOTD */
+#endif
                                /* found - check max args */
                                if ((child->argc - i) > cmdtp->maxargs) {
                                        printf ("Usage:\n%s\n", cmdtp->usage);

diff --git a/common/kgdb.c b/common/kgdb.c
index 747a5b1ad248efda1e25ff307ddbf83379775063..1d346699a56ecfaafececc42a0d4813cca7351da 100644 (file)
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -591,4 +591,4 @@ U_BOOT_CMD(
 
 int kgdb_not_configured = 1;
 
-#endif /* CFG_CMD_KGDB */
+#endif

diff --git a/common/main.c b/common/main.c
index 42e76716c09e303715444111f5d4f39241de476d..c6a65b01e87d31806742b0c643c06120765fb118 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -1325,7 +1325,7 @@ int run_command (const char *cmd, int flag)
                                flag |= CMD_FLAG_BOOTD;
                        }
                }
-#endif /* CFG_CMD_BOOTD */
+#endif
 
                /* OK - call function to do the command */
                if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
@@ -1372,4 +1372,4 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        }
        return 0;
 }
-#endif /* CFG_CMD_RUN */
+#endif

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 2721589a1c27a0c8c33be4e32b5aa82bff0a6786..0f79f367c90b213bf1187cc1c43b278e6197353c 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -1249,4 +1249,4 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
 }
 
 #endif /* CONFIG_USB_STORAGE */
-#endif /* CFG_CMD_USB */
+#endif