common/ non-cmd: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.

All transformations are of the form:
Before:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

Signed-off-by: Jon Loeliger <jdl@freescale.com>

diff --git a/common/bedbug.c b/common/bedbug.c
index 6966de74452c65c5c1f0581425ce592ac1b5810b..1a793f8268ddd8550a077349edd5763fbc1cb520 100644 (file)
--- a/common/bedbug.c
+++ b/common/bedbug.c
@@ -2,7 +2,7 @@
 
 #include <common.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
 
 #include <linux/ctype.h>
 #include <bedbug/bedbug.h>

diff --git a/common/command.c b/common/command.c
index e917975a7331d21f6cf02efad21660ac2e060c77..f8bd16b6f58fa9a69548d3feb505c6822e0a0203 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -42,7 +42,7 @@ U_BOOT_CMD(
        NULL
 );
 
-#if (CONFIG_COMMANDS & CFG_CMD_ECHO)
+#if (CONFIG_COMMANDS & CFG_CMD_ECHO) || defined(CONFIG_CMD_ECHO)
 
 int
 do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -409,7 +409,7 @@ void install_auto_complete(void)
 {
        install_auto_complete_handler("printenv", var_complete);
        install_auto_complete_handler("setenv", var_complete);
-#if (CONFIG_COMMANDS & CFG_CMD_RUN)
+#if (CONFIG_COMMANDS & CFG_CMD_RUN) || defined(CONFIG_CMD_RUN)
        install_auto_complete_handler("run", var_complete);
 #endif
 }

diff --git a/common/docecc.c b/common/docecc.c
index 79adb48958e8a13affa8497582cf1968874541c5..d9c7a4133d449c43e2256ca0c46370d6c77979f7 100644 (file)
--- a/common/docecc.c
+++ b/common/docecc.c
@@ -31,7 +31,7 @@
 #undef ECC_DEBUG
 #undef PSYCHO_DEBUG
 
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
 
 #include <linux/mtd/doc2000.h>
 

diff --git a/common/env_flash.c b/common/env_flash.c
index 1674b30e118d57c60d1a44684138555417fe34b6..f9cf35a184d5326b5454ec1c4fdc50cce0d5481d 100644 (file)
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -37,7 +37,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH))
+#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH)) || (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

diff --git a/common/env_nand.c b/common/env_nand.c
index 67c4a4e011761b92b92f291714cf9af4181696d3..f97af20fa3d1089ad60bc0e3bc528e1d8e66b6cb 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -39,7 +39,7 @@
 #include <malloc.h>
 #include <nand.h>
 
-#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND))
+#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND)) || (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

diff --git a/common/exports.c b/common/exports.c
index 0cb4396ea4ae0a73e781729fe0c267bc40e7bc24..fc8060ae530b02ae66823cddb6906f48c5aec12a 100644 (file)
--- a/common/exports.c
+++ b/common/exports.c
@@ -32,7 +32,7 @@ void jumptable_init (void)
        gd->jt[XF_install_hdlr] = (void *) irq_install_handler;
        gd->jt[XF_free_hdlr] = (void *) irq_free_handler;
 #endif /* I386 || PPC */
-#if (CONFIG_COMMANDS & CFG_CMD_I2C)
+#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
        gd->jt[XF_i2c_write] = (void *) i2c_write;
        gd->jt[XF_i2c_read] = (void *) i2c_read;
 #endif /* CFG_CMD_I2C */

diff --git a/common/hush.c b/common/hush.c
index feb5627ff2eef282b16312cbccca13b208b7ed96..4ddbc64d2e4fc79d41a29aaf2ae896ef96584970 100644 (file)
--- a/common/hush.c
+++ b/common/hush.c
@@ -1682,7 +1682,7 @@ static int run_pipe_real(struct pipe *pi)
                                return -1;      /* give up after bad command */
                        } else {
                                int rcode;
-#if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
+#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD)
            extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
                                /* avoid "bootd" recursion */

diff --git a/common/kgdb.c b/common/kgdb.c
index 6de6ec99a22273c4ff8fd7ac515fcf42cff6ac85..7a3e6d6edbb11370dc39c185e67d35dfcead5865 100644 (file)
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -92,7 +92,7 @@
 #include <kgdb.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
 
 #undef KGDB_DEBUG
 

diff --git a/common/lcd.c b/common/lcd.c
index eaed2abd80563d6fa6958d25b61dfeccd39dc551..3b6391b061455778b6d6b8e8d8c71e991ea2eba5 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -571,7 +571,7 @@ void bitmap_plot (int x, int y)
 #endif /* CONFIG_LCD_LOGO */
 
 /*----------------------------------------------------------------------*/
-#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
+#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 /*
  * Display the BMP file located at address bmp_image.
  * Only uncompressed.

diff --git a/common/main.c b/common/main.c
index a00ebc194c576460908e0d4680e8f807de4ab3fb..99693f4fcf6ecd3671ef59bd06598b26a9ed9951 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -1311,7 +1311,7 @@ int run_command (const char *cmd, int flag)
                        continue;
                }
 
-#if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
+#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD)
                /* avoid "bootd" recursion */
                if (cmdtp->cmd == do_bootd) {
 #ifdef DEBUG_PARSER
@@ -1344,7 +1344,7 @@ int run_command (const char *cmd, int flag)
 
 /****************************************************************************/
 
-#if (CONFIG_COMMANDS & CFG_CMD_RUN)
+#if (CONFIG_COMMANDS & CFG_CMD_RUN) || defined(CONFIG_CMD_RUN)
 int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        int i;

diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index e411e573c7b2bf1248b5759518e6bf40f0942379..6482728e94d3403eb0db03ce91d8dbce87837646 100644 (file)
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -29,7 +29,7 @@
 #include <common.h>
 #include <miiphy.h>
 
-#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)
 #include <asm/types.h>
 #include <linux/list.h>
 #include <malloc.h>

diff --git a/common/usb.c b/common/usb.c
index 0857494b27b974c442b07d96b4f30c46d8d0c54b..282c1d97b7434c77ff025369060719327a27814c 100644 (file)
--- a/common/usb.c
+++ b/common/usb.c
@@ -49,7 +49,7 @@
 #include <asm/processor.h>
 #include <linux/ctype.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
 
 #include <usb.h>
 #ifdef CONFIG_4xx

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 196ceb735934289255047991a41a4942798a93be..d556475b61607469faa0e49e60da9271920bd125 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -55,7 +55,7 @@
 #include <asm/processor.h>
 
 
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
 #include <part.h>
 #include <usb.h>