mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-27 23:20:26 +09:00
Kconfig: Move autoboot options under boot options
At present the autoboot options are in cmd/Kconfig but they don't really relate to commands. They relate to booting, so move this menu under the boot menu. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
7b6baa3314
commit
98eed0d4f9
117
cmd/Kconfig
117
cmd/Kconfig
@ -66,123 +66,6 @@ config SYS_XTRACE
|
|||||||
To enable the tracer a variable "xtrace" needs to be defined in
|
To enable the tracer a variable "xtrace" needs to be defined in
|
||||||
the environment.
|
the environment.
|
||||||
|
|
||||||
menu "Autoboot options"
|
|
||||||
|
|
||||||
config AUTOBOOT
|
|
||||||
bool "Autoboot"
|
|
||||||
default y
|
|
||||||
help
|
|
||||||
This enables the autoboot. See doc/README.autoboot for detail.
|
|
||||||
|
|
||||||
config AUTOBOOT_KEYED
|
|
||||||
bool "Stop autobooting via specific input key / string"
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
This option enables stopping (aborting) of the automatic
|
|
||||||
boot feature only by issuing a specific input key or
|
|
||||||
string. If not enabled, any input key will abort the
|
|
||||||
U-Boot automatic booting process and bring the device
|
|
||||||
to the U-Boot prompt for user input.
|
|
||||||
|
|
||||||
config AUTOBOOT_PROMPT
|
|
||||||
string "Autoboot stop prompt"
|
|
||||||
depends on AUTOBOOT_KEYED
|
|
||||||
default "Autoboot in %d seconds\\n"
|
|
||||||
help
|
|
||||||
This string is displayed before the boot delay selected by
|
|
||||||
CONFIG_BOOTDELAY starts. If it is not defined there is no
|
|
||||||
output indicating that autoboot is in progress.
|
|
||||||
|
|
||||||
Note that this define is used as the (only) argument to a
|
|
||||||
printf() call, so it may contain '%' format specifications,
|
|
||||||
provided that it also includes, sepearated by commas exactly
|
|
||||||
like in a printf statement, the required arguments. It is
|
|
||||||
the responsibility of the user to select only such arguments
|
|
||||||
that are valid in the given context.
|
|
||||||
|
|
||||||
config AUTOBOOT_ENCRYPTION
|
|
||||||
bool "Enable encryption in autoboot stopping"
|
|
||||||
depends on AUTOBOOT_KEYED
|
|
||||||
help
|
|
||||||
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.
|
|
||||||
|
|
||||||
This provides a way to ship a secure production device which can also
|
|
||||||
be accessed at the U-Boot command line.
|
|
||||||
|
|
||||||
config AUTOBOOT_DELAY_STR
|
|
||||||
string "Delay autobooting via specific input key / string"
|
|
||||||
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
|
|
||||||
help
|
|
||||||
This option delays the automatic boot feature by issuing
|
|
||||||
a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR
|
|
||||||
or the environment variable "bootdelaykey" is specified
|
|
||||||
and this string is received from console input before
|
|
||||||
autoboot starts booting, U-Boot gives a command prompt. The
|
|
||||||
U-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME is
|
|
||||||
used, otherwise it never times out.
|
|
||||||
|
|
||||||
config AUTOBOOT_STOP_STR
|
|
||||||
string "Stop autobooting via specific input key / string"
|
|
||||||
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
|
|
||||||
help
|
|
||||||
This option enables stopping (aborting) of the automatic
|
|
||||||
boot feature only by issuing a specific input key or
|
|
||||||
string. If CONFIG_AUTOBOOT_STOP_STR or the environment
|
|
||||||
variable "bootstopkey" is specified and this string is
|
|
||||||
received from console input before autoboot starts booting,
|
|
||||||
U-Boot gives a command prompt. The U-Boot prompt never
|
|
||||||
times out, even if CONFIG_BOOT_RETRY_TIME is used.
|
|
||||||
|
|
||||||
config AUTOBOOT_KEYED_CTRLC
|
|
||||||
bool "Enable Ctrl-C autoboot interruption"
|
|
||||||
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
This option 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_STOP_STR_SHA256
|
|
||||||
string "Stop autobooting via SHA256 encrypted password"
|
|
||||||
depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
|
|
||||||
help
|
|
||||||
This option adds the feature to only stop the autobooting,
|
|
||||||
and therefore boot into the U-Boot prompt, when the input
|
|
||||||
string / password matches a values that is encypted via
|
|
||||||
a SHA256 hash and saved in the environment.
|
|
||||||
|
|
||||||
config AUTOBOOT_USE_MENUKEY
|
|
||||||
bool "Allow a specify key to run a menu from the environment"
|
|
||||||
depends on !AUTOBOOT_KEYED
|
|
||||||
help
|
|
||||||
If a specific key is pressed to stop autoboot, then the commands in
|
|
||||||
the environment variable 'menucmd' are executed before boot starts.
|
|
||||||
|
|
||||||
config AUTOBOOT_MENUKEY
|
|
||||||
int "ASCII value of boot key to show a menu"
|
|
||||||
default 0
|
|
||||||
depends on AUTOBOOT_USE_MENUKEY
|
|
||||||
help
|
|
||||||
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.
|
|
||||||
|
|
||||||
config AUTOBOOT_MENU_SHOW
|
|
||||||
bool "Show a menu on boot"
|
|
||||||
depends on CMD_BOOTMENU
|
|
||||||
help
|
|
||||||
This enables the boot menu, controlled by environment variables
|
|
||||||
defined by the board. The menu starts after running the 'preboot'
|
|
||||||
environmnent variable (if enabled) and before handling the boot delay.
|
|
||||||
See README.bootmenu for more details.
|
|
||||||
|
|
||||||
endmenu
|
|
||||||
|
|
||||||
config BUILD_BIN2C
|
config BUILD_BIN2C
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -691,4 +691,121 @@ config SPI_BOOT
|
|||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
menu "Autoboot options"
|
||||||
|
|
||||||
|
config AUTOBOOT
|
||||||
|
bool "Autoboot"
|
||||||
|
default y
|
||||||
|
help
|
||||||
|
This enables the autoboot. See doc/README.autoboot for detail.
|
||||||
|
|
||||||
|
config AUTOBOOT_KEYED
|
||||||
|
bool "Stop autobooting via specific input key / string"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This option enables stopping (aborting) of the automatic
|
||||||
|
boot feature only by issuing a specific input key or
|
||||||
|
string. If not enabled, any input key will abort the
|
||||||
|
U-Boot automatic booting process and bring the device
|
||||||
|
to the U-Boot prompt for user input.
|
||||||
|
|
||||||
|
config AUTOBOOT_PROMPT
|
||||||
|
string "Autoboot stop prompt"
|
||||||
|
depends on AUTOBOOT_KEYED
|
||||||
|
default "Autoboot in %d seconds\\n"
|
||||||
|
help
|
||||||
|
This string is displayed before the boot delay selected by
|
||||||
|
CONFIG_BOOTDELAY starts. If it is not defined there is no
|
||||||
|
output indicating that autoboot is in progress.
|
||||||
|
|
||||||
|
Note that this define is used as the (only) argument to a
|
||||||
|
printf() call, so it may contain '%' format specifications,
|
||||||
|
provided that it also includes, sepearated by commas exactly
|
||||||
|
like in a printf statement, the required arguments. It is
|
||||||
|
the responsibility of the user to select only such arguments
|
||||||
|
that are valid in the given context.
|
||||||
|
|
||||||
|
config AUTOBOOT_ENCRYPTION
|
||||||
|
bool "Enable encryption in autoboot stopping"
|
||||||
|
depends on AUTOBOOT_KEYED
|
||||||
|
help
|
||||||
|
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.
|
||||||
|
|
||||||
|
This provides a way to ship a secure production device which can also
|
||||||
|
be accessed at the U-Boot command line.
|
||||||
|
|
||||||
|
config AUTOBOOT_DELAY_STR
|
||||||
|
string "Delay autobooting via specific input key / string"
|
||||||
|
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
|
||||||
|
help
|
||||||
|
This option delays the automatic boot feature by issuing
|
||||||
|
a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR
|
||||||
|
or the environment variable "bootdelaykey" is specified
|
||||||
|
and this string is received from console input before
|
||||||
|
autoboot starts booting, U-Boot gives a command prompt. The
|
||||||
|
U-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME is
|
||||||
|
used, otherwise it never times out.
|
||||||
|
|
||||||
|
config AUTOBOOT_STOP_STR
|
||||||
|
string "Stop autobooting via specific input key / string"
|
||||||
|
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
|
||||||
|
help
|
||||||
|
This option enables stopping (aborting) of the automatic
|
||||||
|
boot feature only by issuing a specific input key or
|
||||||
|
string. If CONFIG_AUTOBOOT_STOP_STR or the environment
|
||||||
|
variable "bootstopkey" is specified and this string is
|
||||||
|
received from console input before autoboot starts booting,
|
||||||
|
U-Boot gives a command prompt. The U-Boot prompt never
|
||||||
|
times out, even if CONFIG_BOOT_RETRY_TIME is used.
|
||||||
|
|
||||||
|
config AUTOBOOT_KEYED_CTRLC
|
||||||
|
bool "Enable Ctrl-C autoboot interruption"
|
||||||
|
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This option 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_STOP_STR_SHA256
|
||||||
|
string "Stop autobooting via SHA256 encrypted password"
|
||||||
|
depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
|
||||||
|
help
|
||||||
|
This option adds the feature to only stop the autobooting,
|
||||||
|
and therefore boot into the U-Boot prompt, when the input
|
||||||
|
string / password matches a values that is encypted via
|
||||||
|
a SHA256 hash and saved in the environment.
|
||||||
|
|
||||||
|
config AUTOBOOT_USE_MENUKEY
|
||||||
|
bool "Allow a specify key to run a menu from the environment"
|
||||||
|
depends on !AUTOBOOT_KEYED
|
||||||
|
help
|
||||||
|
If a specific key is pressed to stop autoboot, then the commands in
|
||||||
|
the environment variable 'menucmd' are executed before boot starts.
|
||||||
|
|
||||||
|
config AUTOBOOT_MENUKEY
|
||||||
|
int "ASCII value of boot key to show a menu"
|
||||||
|
default 0
|
||||||
|
depends on AUTOBOOT_USE_MENUKEY
|
||||||
|
help
|
||||||
|
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.
|
||||||
|
|
||||||
|
config AUTOBOOT_MENU_SHOW
|
||||||
|
bool "Show a menu on boot"
|
||||||
|
depends on CMD_BOOTMENU
|
||||||
|
help
|
||||||
|
This enables the boot menu, controlled by environment variables
|
||||||
|
defined by the board. The menu starts after running the 'preboot'
|
||||||
|
environmnent variable (if enabled) and before handling the boot delay.
|
||||||
|
See README.bootmenu for more details.
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
|
||||||
endmenu # Booting
|
endmenu # Booting
|
||||||
|
Loading…
Reference in New Issue
Block a user