configs: Re-sync almost all of cmd/Kconfig

[people/ms/u-boot.git] / include / configs / edb93xx.h

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 0645d341a4bfe9510d74b6efe2e0b6fae3daa8ae..ce5097348bcae5954289268f76d50aeab2ca88a0 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -38,46 +38,37 @@
 
 #define CONFIG_SYS_LDSCRIPT    "board/cirrus/edb93xx/u-boot.lds"
 
-#undef CONFIG_SYS_PROMPT
 #ifdef CONFIG_EDB9301
 #define CONFIG_EP9301
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9301
-#define CONFIG_SYS_PROMPT              "EDB9301> "
 #define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9302)
 #define CONFIG_EP9302
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9302
-#define CONFIG_SYS_PROMPT              "EDB9302> "
 #define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9302A)
 #define CONFIG_EP9302
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9302A
-#define CONFIG_SYS_PROMPT              "EDB9302A> "
 #define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9307)
 #define CONFIG_EP9307
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9307
-#define CONFIG_SYS_PROMPT              "EDB9307> "
 #define CONFIG_ENV_SECT_SIZE           0x00040000
 #elif defined(CONFIG_EDB9307A)
 #define CONFIG_EP9307
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9307A
-#define CONFIG_SYS_PROMPT              "EDB9307A> "
 #define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9312)
 #define CONFIG_EP9312
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9312
-#define CONFIG_SYS_PROMPT              "EDB9312> "
 #define CONFIG_ENV_SECT_SIZE           0x00040000
 #elif defined(CONFIG_EDB9315)
 #define CONFIG_EP9315
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9315
-#define CONFIG_SYS_PROMPT              "EDB9315> "
 #define CONFIG_ENV_SECT_SIZE           0x00040000
 #elif defined(CONFIG_EDB9315A)
 #define CONFIG_EP9315
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9315A
-#define CONFIG_SYS_PROMPT              "EDB9315A> "
 #define CONFIG_ENV_SECT_SIZE           0x00020000
 #else
 #error "no board defined"
@@ -91,7 +82,6 @@
 
 /* Monitor configuration */
 #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_JFFS2
 
 #define CONFIG_SYS_LONGHELP                    /* Enable "long" help in mon */
@@ -269,7 +259,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_USB
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_CMD_BOOTZ