a6654dc76d
Changelog-entry: Rename meta-resin to meta-balena in repository Signed-off-by: Florin Sarbu <florin@balena.io>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|
index 53eae8953e..1e931a0eb0 100644
|
|
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -693,6 +693,8 @@ config ARCH_SUNXI
|
|
select USB_STORAGE if DISTRO_DEFAULTS
|
|
select USB_KEYBOARD if DISTRO_DEFAULTS
|
|
select USE_TINY_PRINTF
|
|
+ imply AUTOBOOT_KEYED
|
|
+ imply AUTOBOOT_KEYED_CTRLC
|
|
imply CMD_FASTBOOT
|
|
imply FASTBOOT
|
|
imply FAT_WRITE
|
|
diff --git a/cmd/Kconfig b/cmd/Kconfig
|
|
index d6d130edfa..46ed3a9d76 100644
|
|
--- a/cmd/Kconfig
|
|
+++ b/cmd/Kconfig
|
|
@@ -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
|