35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||
|
|
index cac4fa09fd..ff46730bfb 100644
|
||
|
|
--- a/arch/arm/Kconfig
|
||
|
|
+++ b/arch/arm/Kconfig
|
||
|
|
@@ -1121,6 +1121,8 @@ config ARCH_SUNXI
|
||
|
|
select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST
|
||
|
|
select USB_STORAGE if DISTRO_DEFAULTS && USB_HOST
|
||
|
|
select SPL_USE_TINY_PRINTF
|
||
|
|
+ imply AUTOBOOT_KEYED
|
||
|
|
+ imply AUTOBOOT_KEYED_CTRLC
|
||
|
|
select USE_PREBOOT
|
||
|
|
select SYS_RELOC_GD_ENV_ADDR
|
||
|
|
imply BOARD_LATE_INIT
|
||
|
|
diff --git a/boot/Kconfig b/boot/Kconfig
|
||
|
|
index 424ad0e466..d139ff9203 100644
|
||
|
|
--- a/boot/Kconfig
|
||
|
|
+++ b/boot/Kconfig
|
||
|
|
@@ -1189,7 +1189,7 @@ config AUTOBOOT_FLUSH_STDIN
|
||
|
|
config AUTOBOOT_PROMPT
|
||
|
|
string "Autoboot stop prompt"
|
||
|
|
depends on AUTOBOOT_KEYED
|
||
|
|
- default "Autoboot in %d seconds\\n"
|
||
|
|
+ default "Autoboot in %d seconds, press <Space> to stop\\n"
|
||
|
|
help
|
||
|
|
This string is displayed before the boot delay selected by
|
||
|
|
CONFIG_BOOTDELAY starts. If it is not defined there is no
|
||
|
|
@@ -1244,6 +1244,7 @@ config AUTOBOOT_DELAY_STR
|
||
|
|
config AUTOBOOT_STOP_STR
|
||
|
|
string "Stop autobooting via specific input key / string"
|
||
|
|
depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
|
||
|
|
+ default " "
|
||
|
|
help
|
||
|
|
This option enables stopping (aborting) of the automatic
|
||
|
|
boot feature only by issuing a specific input key or
|