From 38db7daaf700a985036bb3d00be21c50f71e731c Mon Sep 17 00:00:00 2001 From: Markus Hoffrogge Date: Thu, 10 Nov 2022 13:24:06 +0100 Subject: [PATCH] Fix U-Boot SUNXI enable-autoboot-keyed.patch for U-Boot v2022.07 [AR-1322] (#4403) * Fix u-boot-sunxi/enable-autoboot-keyed.patch for U-Boot v2022.07 Resolves AR-1322 * Rename file u-boot-sunxi/enable-autoboot-keyed.patch.disabled -> u-boot-sunxi/enable-autoboot-keyed.patch Resolves AR-1322 --- ...h.disabled => enable-autoboot-keyed.patch} | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) rename patch/u-boot/u-boot-sunxi/{enable-autoboot-keyed.patch.disabled => enable-autoboot-keyed.patch} (66%) diff --git a/patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch.disabled b/patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch similarity index 66% rename from patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch.disabled rename to patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch index 45497c84cb..3f978f66c7 100644 --- a/patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch.disabled +++ b/patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch @@ -1,21 +1,21 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 53eae8953e..1e931a0eb0 100644 +index 9898c7d6..c5819d9f 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 +@@ -1180,6 +1180,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 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 + imply BOARD_LATE_INIT +diff --git a/boot/Kconfig b/boot/Kconfig +index 08451c65..d0c168cd 100644 +--- a/boot/Kconfig ++++ b/boot/Kconfig +@@ -1003,7 +1003,7 @@ config AUTOBOOT_FLUSH_STDIN config AUTOBOOT_PROMPT string "Autoboot stop prompt" depends on AUTOBOOT_KEYED @@ -24,7 +24,7 @@ index d6d130edfa..46ed3a9d76 100644 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 +@@ -1058,6 +1058,7 @@ config AUTOBOOT_DELAY_STR config AUTOBOOT_STOP_STR string "Stop autobooting via specific input key / string" depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION