mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-08 14:08:26 +00:00
8277822add
* Adjusted patches so they align with 2021.04 - briefly tested on Lime A64 and BPI M3 * Move to RC5 * Move away from RC branch
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|
index 53eae8953e..1e931a0eb0 100644
|
|
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -843,6 +843,8 @@ config ARCH_SUNXI
|
|
select USB_KEYBOARD if DISTRO_DEFAULTS
|
|
select USB_STORAGE if DISTRO_DEFAULTS
|
|
select SPL_USE_TINY_PRINTF
|
|
+ imply AUTOBOOT_KEYED
|
|
+ imply AUTOBOOT_KEYED_CTRLC
|
|
select USE_PREBOOT
|
|
select SYS_RELOC_GD_ENV_ADDR
|
|
imply CMD_DM
|
|
diff --git a/cmd/Kconfig b/cmd/Kconfig
|
|
index d6d130edfa..46ed3a9d76 100644
|
|
--- a/common/Kconfig.boot
|
|
+++ b/common/Kconfig.boot
|
|
@@ -51,7 +51,7 @@ config AUTOBOOT_KEYED
|
|
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
|
|
@@ -84,6 +84,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
|