summaryrefslogtreecommitdiff
path: root/doc/README.autoboot
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-05-18 14:08:22 +0200
committerTom Rini <trini@konsulko.com>2015-06-08 10:45:11 -0400
commit2d908fa084a5b5e10a3726e80b42d2ce5100d079 (patch)
tree4a4085f118e279c5387d7434d0a567afe8f5b8b9 /doc/README.autoboot
parent20c20826efabf9ed64f5555bc8739bdbb89c1edd (diff)
downloadu-boot-imx-2d908fa084a5b5e10a3726e80b42d2ce5100d079.zip
u-boot-imx-2d908fa084a5b5e10a3726e80b42d2ce5100d079.tar.gz
u-boot-imx-2d908fa084a5b5e10a3726e80b42d2ce5100d079.tar.bz2
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 'doc/README.autoboot')
-rw-r--r--doc/README.autoboot10
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/README.autoboot b/doc/README.autoboot
index 14e3660..227e3b5 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -78,13 +78,9 @@ What they do
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
- CONFIG_AUTOBOOT_DELAY_STR2
- CONFIG_AUTOBOOT_STOP_STR2
"bootdelaykey" environment variable
"bootstopkey" environment variable
- "bootdelaykey2" environment variable
- "bootstopkey2" environment variable
These options give more control over stopping autoboot. When
they are used a specific character or string is required to
@@ -130,12 +126,6 @@ What they do
character of a key string does not appear in the rest of the
string.
- Using the CONFIG_AUTOBOOT_DELAY_STR2 #define or the
- "bootdelaykey2" environment variable and/or the
- CONFIG_AUTOBOOT_STOP_STR2 #define or the "bootstopkey"
- environment variable you can specify a second, alternate
- string (which allows you to have two "password" strings).
-
The CONFIG_AUTOBOOT_KEYED_CTRLC #define allows for the boot
sequence to be interrupted by ctrl-c, in addition to the
"bootdelaykey" and "bootstopkey". Setting this variable