Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig

This converts the following to Kconfig:
   CONFIG_AUTOBOOT_MENU_SHOW

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 8d2e0a9e4ec426430abaa537783f56af9e38b1c5..22a3737b4eb7e1cef740d710fc7b2ee9f9e6c008 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -170,6 +170,14 @@ config AUTOBOOT_MENUKEY
          For example, 33 means "!" in ASCII, so pressing ! at boot would take
          this action.
 
+config AUTOBOOT_MENU_SHOW
+       bool "Show a menu on boot"
+       help
+         This enables the boot menu, controlled by environment variables
+         defined by the board. The menu starts after running the 'preboot'
+         environmnent variable (if enabled) and before handling the boot delay.
+         See README.bootmenu for more details.
+
 endmenu
 
 config BUILD_BIN2C

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 5cd96017e5d0e01f6925698a8d6429c6d1e0c562..ab5bb2de6f3ea05e31ec4eac16e8c4eca8d1b17d 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Nokia RX-51 # "
 CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_MENU_SHOW=y
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_SAVEENV is not set

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index b251061e305a2cd531ca2700937ee4d98e87cebb..fd755bbceae8a3a794c7e6cccd6d29a225ef3c3c 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -270,8 +270,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
        "run attachboot;" \
        "echo"
 
-#define CONFIG_AUTOBOOT_MENU_SHOW
-
 /*
  * Miscellaneous configurable options
  */

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 2b1269de837b0fdba27e7671236dc5b06c40c8cf..89cd8b550ae6d7fd19dd86d5b565ff6b74f14af8 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -110,8 +110,6 @@
 #define CONFIG_PL011_CLOCK             24000000
 #endif
 
-/*#define CONFIG_AUTOBOOT_MENU_SHOW*/
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE