Fix remaining CFG_CMD_ define, ifdef and comments

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-07-25 15:18:16 +02:00 committed by Wolfgang Denk
parent 5d1d00fb36
commit 936897d4d1
5 changed files with 8 additions and 8 deletions

View File

@ -321,7 +321,7 @@ nand_init (void)
printf ("%4lu MB\n", totlen >>20); printf ("%4lu MB\n", totlen >>20);
} }
#endif /* CFG_CMD_NAND */ #endif /* CONFIG_CMD_NAND */
#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
/* /*

View File

@ -36,7 +36,7 @@
#include <lmb.h> #include <lmb.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#if (CONFIG_COMMANDS & CFG_CMD_USB) #if (CONFIG_CMD_USB)
#include <usb.h> #include <usb.h>
#endif #endif
@ -217,7 +217,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
*/ */
iflag = disable_interrupts(); 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 * turn off USB to prevent the host controller from writing to the
* SDRAM while Linux is booting. This could happen (at least for OHCI * SDRAM while Linux is booting. This could happen (at least for OHCI

View File

@ -40,7 +40,7 @@
#define CONFIG_MISC_INIT_R 1 #define CONFIG_MISC_INIT_R 1
#define CFG_CACHELINE_SIZE 32 #define CFG_CACHELINE_SIZE 32
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 5 #define CFG_CACHELINE_SHIFT 5
#endif #endif
@ -268,7 +268,7 @@
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
#undef CFG_LONGHELP #undef CFG_LONGHELP
#define CFG_PROMPT "=> " #define CFG_PROMPT "=> "
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 #define CFG_CBSIZE 1024
#else #else
#define CFG_CBSIZE 256 #define CFG_CBSIZE 256

View File

@ -105,7 +105,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"unlock=yes\0" "unlock=yes\0"
#define CFG_CMD_JFFS2 #define CONFIG_CMD_JFFS2
#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_EEPROM
#define CONFIG_CMD_NET #define CONFIG_CMD_NET
#define CONFIG_CMD_RUN #define CONFIG_CMD_RUN

View File

@ -451,7 +451,7 @@ void board_init_f(ulong bootflag)
if ((s = getenv("bootfile")) != NULL) { if ((s = getenv("bootfile")) != NULL) {
copy_filename(BootFile, s, sizeof(BootFile)); copy_filename(BootFile, s, sizeof(BootFile));
} }
#endif /* CFG_CMD_NET */ #endif /* CONFIG_CMD_NET */
WATCHDOG_RESET(); WATCHDOG_RESET();
@ -483,7 +483,7 @@ void board_init_f(ulong bootflag)
WATCHDOG_RESET(); WATCHDOG_RESET();
puts("IDE: "); puts("IDE: ");
ide_init(); ide_init();
#endif /* CFG_CMD_IDE */ #endif /* CONFIG_CMD_IDE */
#ifdef CONFIG_LAST_STAGE_INIT #ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET(); WATCHDOG_RESET();