X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=doc%2FREADME.autoboot;h=eeb7e4c66235163d33372f60307a925679a6a119;hb=eca61ae70c80ce42272ab8b999750d925f0ad85c;hp=14e3660dd8d7634e058d280bed1e457de8838066;hpb=00ddacc1a1860bf777ba32ac0ece7a566c97bf48;p=oweals%2Fu-boot.git

diff --git a/doc/README.autoboot b/doc/README.autoboot
index 14e3660dd8..eeb7e4c662 100644
--- 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
@@ -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,26 +126,12 @@ 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
 	provides an escape sequence from the limited "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.
-
   CONFIG_RESET_TO_RETRY
 
 	(Only effective when CONFIG_BOOT_RETRY_TIME is also set)