Merge branch 'next'

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

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 5649901..5edc8f6 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -13,13 +13,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DEFAULTENV_VARS
 #define CONFIG_CMD_GREPENV
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
@@ -59,6 +56,10 @@
 #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
 #define CONFIG_SYS_IVM_EEPROM_MAX_LEN  0x400
@@ -82,7 +83,6 @@
 #define CONFIG_MTD_CONCAT
 
 #define CONFIG_CMD_CRAMFS
-#define CONFIG_CRAMFS_CMDLINE
 
 #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
 #define CONFIG_KM_DEF_ENV_BOOTPARAMS \
@@ -140,8 +140,9 @@
  * - 'release': for a standalone system                kernel/rootfs from flash
  */
 #define CONFIG_KM_DEF_ENV_BOOTTARGETS                                  \
-       "subbootcmds=ubiattach ubicopy cramfsloadfdt set_fdthigh "      \
-               "cramfsloadkernel flashargs add_default addpanic boot\0"\
+       "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt "         \
+               "set_fdthigh cramfsloadkernel flashargs add_default "   \
+               "addpanic boot\0"                                       \
        "develop="                                                      \
                "tftp 200000 scripts/develop-${arch}.txt && "           \
                "env import -t 200000 ${filesize} && "                  \