X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=doc%2FREADME.autoboot;h=5e9a5e1cf7fe09367c19517e36988a66a88df868;hb=d9e7efe10a8ebf8e2142374be8438540838eb235;hp=14e3660dd8d7634e058d280bed1e457de8838066;hpb=00ddacc1a1860bf777ba32ac0ece7a566c97bf48;p=platform%2Fkernel%2Fu-boot.git

diff --git a/doc/README.autoboot b/doc/README.autoboot
index 14e3660..5e9a5e1 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,28 +126,37 @@ 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_AUTOBOOT_ENCRYPTION
+
+  "bootstopkeysha256"	environment variable
+
+	- Hash value of the input which unlocks the device and
+	  stops autoboot.
 
-  CONFIG_ZERO_BOOTDELAY_CHECK
+	This option allows a string to be entered into U-Boot to stop the
+	autoboot. The string itself is hashed and compared against the hash
+	in the environment variable 'bootstopkeysha256'. If it matches then
+	boot stops and a command-line prompt is presented.
 
-	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.
+	This provides a way to ship a secure production device which can also
+	be accessed at the U-Boot command line.
 
   CONFIG_RESET_TO_RETRY
 
 	(Only effective when CONFIG_BOOT_RETRY_TIME is also set)
 	After the countdown timed out, the board will be reset to restart
 	again.
+
+  CONFIG_AUTOBOOT_USE_MENUKEY
+  CONFIG_AUTOBOOT_MENUKEY
+
+	If this key is pressed to stop autoboot, then the commands in the
+	environment variable 'menucmd' will be executed before boot starts.
+	For example, 33 means "!" in ASCII, so pressing ! at boot would take
+	this action.