[U-Boot-Users] [PATCH 12/30] lib_{m68k, microblaze, mips, ppc}/: Remove obsolete references to CONFIG_COMMANDS

10 Jul 2007

Signed-off-by: Jon Loeliger jdl@freescale.com
---
 lib_m68k/board.c       |   20 ++++++++++----------
 lib_microblaze/board.c |    8 ++++----
 lib_mips/board.c       |    4 ++--
 lib_ppc/board.c        |   34 +++++++++++++++++-----------------
 lib_ppc/kgdb.c         |    2 +-
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 03ae18d..b7e76b8 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) || defined(CONFIG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE)
 #include <ide.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
+#if defined(CONFIG_CMD_SCSI)
 #include <scsi.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
+#if 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) || defined(CONFIG_CMD_BEDBUG)
+#if 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) || defined(CONFIG_CMD_KGDB)
+#if 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) || defined(CONFIG_CMD_NET)
+#if 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) || defined(CONFIG_CMD_DOC)
+#if defined(CONFIG_CMD_DOC)
    WATCHDOG_RESET ();
    puts ("DOC:   ");
    doc_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
    WATCHDOG_RESET ();
    puts ("NAND:  ");
    nand_init();		/* go init the NAND */
 #endif
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(FEC_ENET)
+#if 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) || defined(CONFIG_CMD_BEDBUG)
+#if defined(CONFIG_CMD_BEDBUG)
    WATCHDOG_RESET ();
    bedbug_init ();
 #endif
diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c
index 07fb0fa..09d4d94 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) || defined(CONFIG_CMD_NET)
+#if 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) || defined(CONFIG_CMD_FLASH)
+#if 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) || defined(CONFIG_CMD_FLASH)
+#if 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) || defined(CONFIG_CMD_NET)
+#if 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 654c5af..dd3d167 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) || defined(CONFIG_CMD_NET)
+#if 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) || defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
    puts ("Net:   ");
 #endif
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 8bb885d..12ea473 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -35,13 +35,13 @@
 #ifdef CONFIG_MPC5xxx
 #include <mpc5xxx.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE)
 #include <ide.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
+#if defined(CONFIG_CMD_SCSI)
 #include <scsi.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #include <kgdb.h>
 #endif
 #ifdef CONFIG_STATUS_LED
@@ -80,14 +80,14 @@ extern int update_flash_size (int flash_size);
 extern void sc3_read_eeprom(void);
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
+#if defined(CONFIG_CMD_DOC)
 void doc_init (void);
 #endif
 #if defined(CONFIG_HARD_I2C) || \
     defined(CONFIG_SOFT_I2C)
 #include <i2c.h>
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 void nand_init (void);
 #endif
@@ -118,7 +118,7 @@ extern ulong __init_end;
 extern ulong _end;
 ulong monitor_flash_len;
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
+#if defined(CONFIG_CMD_BEDBUG)
 #include <bedbug/type.h>
 #endif
@@ -784,7 +784,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    spi_init_r ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
    WATCHDOG_RESET ();
    puts ("NAND:  ");
    nand_init();		/* go init the NAND */
@@ -946,7 +946,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    	hermes_start_lxt980 ((int) bd->bi_ethspeed);
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
    WATCHDOG_RESET ();
    puts ("KGDB:  ");
    kgdb_init ();
@@ -978,7 +978,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) || defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
    if ((s = getenv ("bootfile")) != NULL) {
    	copy_filename (BootFile, s, sizeof (BootFile));
    }
@@ -986,19 +986,19 @@ void board_init_r (gd_t *id, ulong dest_addr)
WATCHDOG_RESET ();
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
+#if defined(CONFIG_CMD_SCSI)
    WATCHDOG_RESET ();
    puts ("SCSI:  ");
    scsi_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
+#if defined(CONFIG_CMD_DOC)
    WATCHDOG_RESET ();
    puts ("DOC:   ");
    doc_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
 #if defined(CONFIG_NET_MULTI)
    WATCHDOG_RESET ();
    puts ("Net:   ");
@@ -1006,7 +1006,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    eth_initialize (bd);
 #endif
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && ( \
+#if defined(CONFIG_CMD_NET) && ( \
     defined(CONFIG_CCM)		|| \
     defined(CONFIG_ELPT860)	|| \
     defined(CONFIG_EP8260)	|| \
@@ -1031,14 +1031,14 @@ void board_init_r (gd_t *id, ulong dest_addr)
    post_run (NULL, POST_RAM | post_bootmode_get(0));
 #endif
-#if ((CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)) \
-    && !((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE))
+#if defined(CONFIG_CMD_PCMCIA) \
+    && !defined(CONFIG_CMD_IDE)
    WATCHDOG_RESET ();
    puts ("PCMCIA:");
    pcmcia_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE)
    WATCHDOG_RESET ();
 # ifdef	CONFIG_IDE_8xx_PCCARD
    puts ("PCMCIA:");
@@ -1063,7 +1063,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
    last_stage_init ();
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
+#if defined(CONFIG_CMD_BEDBUG)
    WATCHDOG_RESET ();
    bedbug_init ();
 #endif
diff --git a/lib_ppc/kgdb.c b/lib_ppc/kgdb.c
index 243d311..d272d3a 100644
--- a/lib_ppc/kgdb.c
+++ b/lib_ppc/kgdb.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <command.h>
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
#include <kgdb.h>
 #include <asm/signal.h>
-- 
1.5.2.2.249.g45fd



    

Jon Loeliger

tags (0)

participants (1)