summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/ids8247/ids8247.c2
-rw-r--r--common/cmd_bootm.c4
-rw-r--r--include/configs/MVBC_P.h4
-rw-r--r--include/configs/m501sk.h2
-rw-r--r--lib_sparc/board.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c
index 44fc79cd58d..065014a11e4 100644
--- a/board/ids8247/ids8247.c
+++ b/board/ids8247/ids8247.c
@@ -321,7 +321,7 @@ nand_init (void)
printf ("%4lu MB\n", totlen >>20);
}
-#endif /* CFG_CMD_NAND */
+#endif /* CONFIG_CMD_NAND */
#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
/*
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 1c0a4161d0e..4040a691dd7 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -36,7 +36,7 @@
#include <lmb.h>
#include <asm/byteorder.h>
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if (CONFIG_CMD_USB)
#include <usb.h>
#endif
@@ -217,7 +217,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
*/
iflag = disable_interrupts();
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if (CONFIG_CMD_USB)
/*
* turn off USB to prevent the host controller from writing to the
* SDRAM while Linux is booting. This could happen (at least for OHCI
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 04580b7a264..ff6f6cc4a19 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -40,7 +40,7 @@
#define CONFIG_MISC_INIT_R 1
#define CFG_CACHELINE_SIZE 32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if (CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 5
#endif
@@ -268,7 +268,7 @@
#define CFG_PROMPT_HUSH_PS2 "> "
#undef CFG_LONGHELP
#define CFG_PROMPT "=> "
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if (CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024
#else
#define CFG_CBSIZE 256
diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 095fdaf5c8b..060330ef899 100644
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -105,7 +105,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"unlock=yes\0"
-#define CFG_CMD_JFFS2
+#define CONFIG_CMD_JFFS2
#undef CONFIG_CMD_EEPROM
#define CONFIG_CMD_NET
#define CONFIG_CMD_RUN
diff --git a/lib_sparc/board.c b/lib_sparc/board.c
index af301c046e1..205a8ca5327 100644
--- a/lib_sparc/board.c
+++ b/lib_sparc/board.c
@@ -451,7 +451,7 @@ void board_init_f(ulong bootflag)
if ((s = getenv("bootfile")) != NULL) {
copy_filename(BootFile, s, sizeof(BootFile));
}
-#endif /* CFG_CMD_NET */
+#endif /* CONFIG_CMD_NET */
WATCHDOG_RESET();
@@ -483,7 +483,7 @@ void board_init_f(ulong bootflag)
WATCHDOG_RESET();
puts("IDE: ");
ide_init();
-#endif /* CFG_CMD_IDE */
+#endif /* CONFIG_CMD_IDE */
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET();