Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

[u-boot] / include / configs / km / keymile-common.h

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index ab727aa48d66cc6064751ce65077194ccbc2caf2..6f2773b88c1ccc5bb2e1e1dae215b9dae7581e51 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -13,21 +13,14 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DEFAULTENV_VARS
-#define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IMMAP
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MTDPARTS
 
 #undef CONFIG_WATCHDOG         /* disable platform specific watchdog */
 
-#define CONFIG_BOOTDELAY       2 /* autoboot after 2 seconds */
 #undef CONFIG_BOOTARGS         /* the boot command will set bootargs */
 
 /*
@@ -55,9 +48,6 @@
 #define CONFIG_LOADS_ECHO
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Hit <SPACE> key to stop autoboot in %2ds\n"
-#define CONFIG_AUTOBOOT_STOP_STR        " "
 
 /* Support the IVM EEprom */
 #define        CONFIG_SYS_IVM_EEPROM_ADR       0x50