diff options
| author | Stefan Roese <sr@denx.de> | 2015-05-18 14:08:22 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-08 10:45:11 -0400 |
| commit | 2d908fa084a5b5e10a3726e80b42d2ce5100d079 (patch) | |
| tree | 4a4085f118e279c5387d7434d0a567afe8f5b8b9 /common | |
| parent | 20c20826efabf9ed64f5555bc8739bdbb89c1edd (diff) | |
| download | talos-obmc-uboot-2d908fa084a5b5e10a3726e80b42d2ce5100d079.tar.gz talos-obmc-uboot-2d908fa084a5b5e10a3726e80b42d2ce5100d079.zip | |
autoboot.c: Remove CONFIG_AUTOBOOT_STOP_STR2 and CONFIG_AUTOBOOT_DELAY_STR2
These defines for a 2nd autoboot stop and delay string are nearly unused. Only
sc3 defines CONFIG_AUTOBOOT_DELAY_STR2. And a patch to remove this most likely
unmaintained board is also posted to the list.
By removing these defines the code will become cleaner and moving the remaining
compile options to Kconfig will get easier.
Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index c27cc2c751..7c92f3e54d 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -42,9 +42,7 @@ static int abortboot_keyed(int bootdelay) } delaykey[] = { { .str = getenv("bootdelaykey"), .retry = 1 }, - { .str = getenv("bootdelaykey2"), .retry = 1 }, { .str = getenv("bootstopkey"), .retry = 0 }, - { .str = getenv("bootstopkey2"), .retry = 0 }, }; char presskey[MAX_DELAY_STOP_STR]; @@ -65,17 +63,9 @@ static int abortboot_keyed(int bootdelay) if (delaykey[0].str == NULL) delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR; # endif -# ifdef CONFIG_AUTOBOOT_DELAY_STR2 - if (delaykey[1].str == NULL) - delaykey[1].str = CONFIG_AUTOBOOT_DELAY_STR2; -# endif # ifdef CONFIG_AUTOBOOT_STOP_STR - if (delaykey[2].str == NULL) - delaykey[2].str = CONFIG_AUTOBOOT_STOP_STR; -# endif -# ifdef CONFIG_AUTOBOOT_STOP_STR2 - if (delaykey[3].str == NULL) - delaykey[3].str = CONFIG_AUTOBOOT_STOP_STR2; + if (delaykey[1].str == NULL) + delaykey[1].str = CONFIG_AUTOBOOT_STOP_STR; # endif for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i++) { |
