Commit 2d908fa084a5b5e10a3726e80b42d2ce5100d079
Committed by
Tom Rini
Tom Rini
1 parent
20c20826ef
Exists in
v2017.01-smarct4x
and in
34 other branches
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>
Showing 3 changed files with 2 additions and 24 deletions Side-by-side Diff
README
common/autoboot.c
| ... | ... | @@ -42,9 +42,7 @@ |
| 42 | 42 | } |
| 43 | 43 | delaykey[] = { |
| 44 | 44 | { .str = getenv("bootdelaykey"), .retry = 1 }, |
| 45 | - { .str = getenv("bootdelaykey2"), .retry = 1 }, | |
| 46 | 45 | { .str = getenv("bootstopkey"), .retry = 0 }, |
| 47 | - { .str = getenv("bootstopkey2"), .retry = 0 }, | |
| 48 | 46 | }; |
| 49 | 47 | |
| 50 | 48 | char presskey[MAX_DELAY_STOP_STR]; |
| 51 | 49 | |
| ... | ... | @@ -65,17 +63,9 @@ |
| 65 | 63 | if (delaykey[0].str == NULL) |
| 66 | 64 | delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR; |
| 67 | 65 | # endif |
| 68 | -# ifdef CONFIG_AUTOBOOT_DELAY_STR2 | |
| 69 | - if (delaykey[1].str == NULL) | |
| 70 | - delaykey[1].str = CONFIG_AUTOBOOT_DELAY_STR2; | |
| 71 | -# endif | |
| 72 | 66 | # ifdef CONFIG_AUTOBOOT_STOP_STR |
| 73 | - if (delaykey[2].str == NULL) | |
| 74 | - delaykey[2].str = CONFIG_AUTOBOOT_STOP_STR; | |
| 75 | -# endif | |
| 76 | -# ifdef CONFIG_AUTOBOOT_STOP_STR2 | |
| 77 | - if (delaykey[3].str == NULL) | |
| 78 | - delaykey[3].str = CONFIG_AUTOBOOT_STOP_STR2; | |
| 67 | + if (delaykey[1].str == NULL) | |
| 68 | + delaykey[1].str = CONFIG_AUTOBOOT_STOP_STR; | |
| 79 | 69 | # endif |
| 80 | 70 | |
| 81 | 71 | for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i++) { |
doc/README.autoboot
| ... | ... | @@ -78,13 +78,9 @@ |
| 78 | 78 | CONFIG_AUTOBOOT_PROMPT |
| 79 | 79 | CONFIG_AUTOBOOT_DELAY_STR |
| 80 | 80 | CONFIG_AUTOBOOT_STOP_STR |
| 81 | - CONFIG_AUTOBOOT_DELAY_STR2 | |
| 82 | - CONFIG_AUTOBOOT_STOP_STR2 | |
| 83 | 81 | |
| 84 | 82 | "bootdelaykey" environment variable |
| 85 | 83 | "bootstopkey" environment variable |
| 86 | - "bootdelaykey2" environment variable | |
| 87 | - "bootstopkey2" environment variable | |
| 88 | 84 | |
| 89 | 85 | These options give more control over stopping autoboot. When |
| 90 | 86 | they are used a specific character or string is required to |
| ... | ... | @@ -129,12 +125,6 @@ |
| 129 | 125 | for a shorter partial match, so it's best if the first |
| 130 | 126 | character of a key string does not appear in the rest of the |
| 131 | 127 | string. |
| 132 | - | |
| 133 | - Using the CONFIG_AUTOBOOT_DELAY_STR2 #define or the | |
| 134 | - "bootdelaykey2" environment variable and/or the | |
| 135 | - CONFIG_AUTOBOOT_STOP_STR2 #define or the "bootstopkey" | |
| 136 | - environment variable you can specify a second, alternate | |
| 137 | - string (which allows you to have two "password" strings). | |
| 138 | 128 | |
| 139 | 129 | The CONFIG_AUTOBOOT_KEYED_CTRLC #define allows for the boot |
| 140 | 130 | sequence to be interrupted by ctrl-c, in addition to the |