[U-Boot-Users] [PATCH: cmdcfg: 11/19] lib_/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_).

12 Jun 2007

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
---
 lib_arm/board.c        |    8 ++++----
 lib_avr32/board.c      |    2 +-
 lib_blackfin/board.c   |    6 +++---
 lib_generic/crc32.c    |    5 +++--
 lib_i386/board.c       |   17 +++++++++--------
 lib_m68k/board.c       |   20 ++++++++++----------
 lib_microblaze/board.c |    8 ++++----
 lib_mips/board.c       |    4 ++--
 8 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/lib_arm/board.c b/lib_arm/board.c
index babc254..69d4782 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -54,7 +54,7 @@
DECLARE_GLOBAL_DATA_PTR;
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
 void nand_init (void);
 #endif
@@ -296,7 +296,7 @@ void start_armboot (void)
    /* armboot_start is defined in the board-specific linker script */
    mem_malloc_init (_armboot_start - CFG_MALLOC_LEN);
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
    puts ("NAND:  ");
    nand_init();		/* go init the NAND */
 #endif
@@ -378,7 +378,7 @@ void start_armboot (void)
    if ((s = getenv ("loadaddr")) != NULL) {
    	load_addr = simple_strtoul (s, NULL, 16);
    }
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
    if ((s = getenv ("bootfile")) != NULL) {
    	copy_filename (BootFile, s, sizeof (BootFile));
    }
@@ -387,7 +387,7 @@ void start_armboot (void)
 #ifdef BOARD_LATE_INIT
    board_late_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
    puts ("Net:   ");
 #endif
diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index 265328a..822668c 100644
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -328,7 +328,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
    jumptable_init();
    console_init_r();
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
    puts("Net:   ");
 #endif
diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index 1538da3..d359710 100644
--- a/lib_blackfin/board.c
+++ b/lib_blackfin/board.c
@@ -297,7 +297,7 @@ void board_init_f(ulong bootflag)
    }
checkboard();
-#if defined(CONFIG_RTC_BF533) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_BF533) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
    rtc_init();
 #endif
    timer_init();
@@ -391,13 +391,13 @@ void board_init_r(gd_t * id, ulong dest_addr)
    if ((s = getenv("loadaddr")) != NULL) {
    	load_addr = simple_strtoul(s, NULL, 16);
    }
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
    if ((s = getenv("bootfile")) != NULL) {
    	copy_filename(BootFile, s, sizeof(BootFile));
    }
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
    puts("NAND:  ");
    nand_init();		/* go init the NAND */
 #endif
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 3d99b69..84deba9 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -171,8 +171,9 @@ uLong ZEXPORT crc32(crc, buf, len)
     return crc ^ 0xffffffffL;
 }
-#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || \
-	((CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY))
+#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) || \
+	(((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) \
+	&& !defined(CFG_NAND_LEGACY))
/* No ones complement version. JFFS2 (and other things ?)
  * don't use ones compliment in their CRC calculations.
diff --git a/lib_i386/board.c b/lib_i386/board.c
index 4175fdb..1efe81e 100644
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -313,13 +313,14 @@ void start_i386boot (void)
    misc_init_r();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)
+#if ((CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA))
+	&& !((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE))
    WATCHDOG_RESET();
    puts ("PCMCIA:");
    pcmcia_init();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
    WATCHDOG_RESET();
    puts("KGDB:  ");
    kgdb_init();
@@ -348,7 +349,7 @@ void start_i386boot (void)
    if ((s = getenv ("loadaddr")) != NULL) {
    	load_addr = simple_strtoul (s, NULL, 16);
    }
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
    if ((s = getenv ("bootfile")) != NULL) {
    	copy_filename (BootFile, s, sizeof (BootFile));
    }
@@ -356,25 +357,25 @@ void start_i386boot (void)
WATCHDOG_RESET();
-#if (CONFIG_COMMANDS & CFG_CMD_IDE)
+#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
    WATCHDOG_RESET();
    puts("IDE:   ");
    ide_init();
 #endif /* CFG_CMD_IDE */
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI)
+#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
    WATCHDOG_RESET();
    puts("SCSI:  ");
    scsi_init();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
    WATCHDOG_RESET();
    puts("DOC:   ");
    doc_init();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
    WATCHDOG_RESET();
    puts("Net:   ");
@@ -382,7 +383,7 @@ void start_i386boot (void)
    eth_initialize(gd->bd);
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && (0)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET)  || defined(CONFIG_CMD_NET)) && (0)
    WATCHDOG_RESET();
 # ifdef DEBUG
    puts ("Reset Ethernet PHY\n");
diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 6aaf609..03ae18d 100644
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -34,20 +34,20 @@
 #include <asm/immap_5272.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_IDE)
+#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
 #include <ide.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI)
+#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
 #include <scsi.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
 #include <kgdb.h>
 #endif
 #ifdef CONFIG_STATUS_LED
 #include <status_led.h>
 #endif
 #include <net.h>
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
 #include <cmd_bedbug.h>
 #endif
 #ifdef CFG_ALLOC_DPRAM
@@ -584,7 +584,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    misc_init_r ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
    WATCHDOG_RESET ();
    puts ("KGDB:  ");
    kgdb_init ();
@@ -620,7 +620,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    if ((s = getenv ("loadaddr")) != NULL) {
    	load_addr = simple_strtoul (s, NULL, 16);
    }
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
    if ((s = getenv ("bootfile")) != NULL) {
    	copy_filename (BootFile, s, sizeof (BootFile));
    }
@@ -628,19 +628,19 @@ void board_init_r (gd_t *id, ulong dest_addr)
WATCHDOG_RESET ();
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
    WATCHDOG_RESET ();
    puts ("DOC:   ");
    doc_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
    WATCHDOG_RESET ();
    puts ("NAND:  ");
    nand_init();		/* go init the NAND */
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(FEC_ENET)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(FEC_ENET)
    WATCHDOG_RESET();
    eth_init(bd);
 #endif
@@ -659,7 +659,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    last_stage_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
    WATCHDOG_RESET ();
    bedbug_init ();
 #endif
diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c
index c95125a..07fb0fa 100644
--- a/lib_microblaze/board.c
+++ b/lib_microblaze/board.c
@@ -40,7 +40,7 @@ extern int gpio_init (void);
 #ifdef CFG_INTC_0
 extern int interrupts_init (void);
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
 extern int eth_init (bd_t * bis);
 extern int getenv_IPaddr (char *);
 #endif
@@ -108,7 +108,7 @@ void board_init (void)
    bd_t *bd;
    init_fnc_t **init_fnc_ptr;
    gd = (gd_t *) CFG_GBL_DATA_OFFSET;
-#if (CONFIG_COMMANDS & CFG_CMD_FLASH)
+#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
    ulong flash_size = 0;
 #endif
    asm ("nop");	/* FIXME gd is not initialize - wait */
@@ -130,7 +130,7 @@ void board_init (void)
    	}
    }
-#if (CONFIG_COMMANDS & CFG_CMD_FLASH)
+#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
    bd->bi_flashstart = CFG_FLASH_BASE;
    if (0 < (flash_size = flash_init ())) {
    	bd->bi_flashsize = flash_size;
@@ -143,7 +143,7 @@ void board_init (void)
    }
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
    char *s, *e;
    int i;
    /* board MAC address */
diff --git a/lib_mips/board.c b/lib_mips/board.c
index b7d3356..654c5af 100644
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -399,7 +399,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    if ((s = getenv ("loadaddr")) != NULL) {
    	load_addr = simple_strtoul (s, NULL, 16);
    }
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
    if ((s = getenv ("bootfile")) != NULL) {
    	copy_filename (BootFile, s, sizeof (BootFile));
    }
@@ -410,7 +410,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    misc_init_r ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
    puts ("Net:   ");
 #endif
-- 
1.5.2.1.239.g75d8



    

[U-Boot-Users] [PATCH: cmdcfg: 11/19] lib_*/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

Jon Loeliger

[U-Boot-Users] [PATCH: cmdcfg: 11/19] lib_/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_).