autoboot: Drop unused CONFIG_MENUPROMPT

This is not defined by any board. We could use CONFIG_AUTOBOOT_PROMPT
instead perhaps, but this depends on CONFIG_AUTOBOOT_KEYED which is not
used for the single-key case.

So let's just remove CONFIG_MENUPROMPT.

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

diff --git a/common/autoboot.c b/common/autoboot.c
index 012dd5797e122fdb32f7bd110567b773fc9a3032..a6071ab83911c9b2d449b8ead65bb295577e62b6 100644 (file)
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -233,11 +233,7 @@ static int abortboot_single_key(int bootdelay)
        int abort = 0;
        unsigned long ts;
 
-#ifdef CONFIG_MENUPROMPT
-       printf(CONFIG_MENUPROMPT);
-#else
        printf("Hit any key to stop autoboot: %2d ", bootdelay);
-#endif
 
        /*
         * Check if key already pressed

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d06e2d2c23ca5c8dfe91031fabda7ba44817e903..28494411feb52d09f286172e0239afff59a3eaa4 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1141,7 +1141,6 @@ CONFIG_MEM_HOLE_16M
 CONFIG_MEM_INIT_VALUE
 CONFIG_MEM_REMAP
 CONFIG_MENUKEY
-CONFIG_MENUPROMPT
 CONFIG_MENU_SHOW
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MIIM_ADDRESS