diff options
| author | Simon Glass <sjg@chromium.org> | 2019-07-20 20:51:20 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-02 11:19:14 -0400 |
| commit | 2452bb7636beb5eeae29185518a899349289c609 (patch) | |
| tree | b9e58f04a7a20d3ad9fd64b94caa4f9924c5e265 | |
| parent | e79e4b250af3c714cfa9aecb2cf5165443429210 (diff) | |
| download | u-boot-2452bb7636beb5eeae29185518a899349289c609.tar.gz | |
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>
| -rw-r--r-- | common/autoboot.c | 4 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 012dd5797e..a6071ab839 100644 --- 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 d06e2d2c23..28494411fe 100644 --- 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 |