Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / doc / README.autoboot

diff --git a/doc/README.autoboot b/doc/README.autoboot
index e4fabc90ce830313d50c429730dd03baac0c8ae8..eeb7e4c66235163d33372f60307a925679a6a119 100644 (file)
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -1,8 +1,8 @@
+SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Dave Ellis, SIXNET, dge@sixnetio.com
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 Using autoboot configuration options
@@ -74,16 +74,13 @@ What they do
        "bootretry" is >= 0.
 
   CONFIG_AUTOBOOT_KEYED
+  CONFIG_AUTOBOOT_KEYED_CTRLC
   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
@@ -129,18 +126,11 @@ 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).
-
-  CONFIG_ZERO_BOOTDELAY_CHECK
-
-       If this option is defined, you can stop the autoboot process
-       by hitting a key even in that case when "bootdelay" has been
-       set to 0. You can set "bootdelay" to a negative value to
-       prevent the check for console input.
+       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
+       provides an escape sequence from the limited "password"
+       strings.
 
   CONFIG_RESET_TO_RETRY