summaryrefslogtreecommitdiff
path: root/lib_m68k/board.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-09 18:02:11 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-09 18:02:11 -0500
commit7def6b34f910f08d7ef0a14646da067719237ca2 (patch)
tree8ebc3b7fd7595d1dce4e55d745b604eecf14b98e /lib_m68k/board.c
parentdd60d1223b99a88a7216f3e041fe40634ad4c2bb (diff)
downloadu-boot-imx-7def6b34f910f08d7ef0a14646da067719237ca2.zip
u-boot-imx-7def6b34f910f08d7ef0a14646da067719237ca2.tar.gz
u-boot-imx-7def6b34f910f08d7ef0a14646da067719237ca2.tar.bz2
lib_{m68k,microblaze,mips,ppc}/: Remove obsolete references to CONFIG_COMMANDS
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'lib_m68k/board.c')
-rw-r--r--lib_m68k/board.c20
1 files changed, 10 insertions, 10 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