Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

[karo-tx-uboot.git] / doc / README.autoboot

diff --git a/doc/README.autoboot b/doc/README.autoboot
index ff58a79e490a94502f4951cf0792ec97f80a8a48..14e3660dd8d7634e058d280bed1e457de8838066 100644 (file)
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -74,6 +74,7 @@ What they do
        "bootretry" is >= 0.
 
   CONFIG_AUTOBOOT_KEYED
+  CONFIG_AUTOBOOT_KEYED_CTRLC
   CONFIG_AUTOBOOT_PROMPT
   CONFIG_AUTOBOOT_DELAY_STR
   CONFIG_AUTOBOOT_STOP_STR
@@ -135,6 +136,13 @@ What they do
        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