Merge git://git.denx.de/u-boot-socfpga

[people/ms/u-boot.git] / doc / README.autoboot

diff --git a/doc/README.autoboot b/doc/README.autoboot
index 14e3660dd8d7634e058d280bed1e457de8838066..30fd0b0e88ae400dab80f8057bca80cc65b133da 100644 (file)
--- 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,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)