X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=doc%2FREADME.autoboot;h=30fd0b0e88ae400dab80f8057bca80cc65b133da;hb=fd12455643dbe68e2a3675b1d2adb384ebacd251;hp=ff58a79e490a94502f4951cf0792ec97f80a8a48;hpb=9cc18042e61275210cf888e5759347eeb2a2e297;p=u-boot

diff --git a/doc/README.autoboot b/doc/README.autoboot
index ff58a79e49..30fd0b0e88 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -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