From 9e2ca6f1c03fb3a89a2acc621f673a2a295a5db5 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-fdr@jannau.net>
Date: Apr 20 2024 07:11:45 +0000
Subject: Restore boot behavior on Apple silicon systems


Force disable AUTOBOOT_KEYED due to default change in Fedora patches.

---

diff --git a/asahi-c134629a8bc448e979967bf0632fdd5bb42ee1d7.patch b/asahi-c134629a8bc448e979967bf0632fdd5bb42ee1d7.patch
new file mode 100644
index 0000000..766e488
--- /dev/null
+++ b/asahi-c134629a8bc448e979967bf0632fdd5bb42ee1d7.patch
@@ -0,0 +1,24 @@
+commit c134629a8bc448e979967bf0632fdd5bb42ee1d7
+Author: Janne Grunau <j@jannau.net>
+Date:   Sat Apr 20 08:59:29 2024 +0200
+
+    FEDORA: configs: apple: Disable AUTOBOOT_KEYED
+    
+    Fedora patches this to 'default y' but the behavior on
+    Fedora-Asahi-Remix was to interrupt boot with any key. Keep this
+    behavior.
+    
+    Signed-off-by: Janne Grunau <j@jannau.net>
+
+diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig
+index 4a61a893a4..477ce87f4d 100644
+--- a/configs/apple_m1_defconfig
++++ b/configs/apple_m1_defconfig
+@@ -4,6 +4,7 @@ CONFIG_ARCH_APPLE=y
+ CONFIG_DEFAULT_DEVICE_TREE="t8103-j274"
+ CONFIG_SYS_LOAD_ADDR=0x0
+ CONFIG_SYS_BOOTM_LEN=0x800000
++# CONFIG_AUTOBOOT_KEYED is not set
+ # CONFIG_AUTOBOOT_MENU_SHOW is not set
+ CONFIG_USE_PREBOOT=y
+ CONFIG_SYS_CBSIZE=256
diff --git a/uboot-tools.spec b/uboot-tools.spec
index d950cc1..c3fe625 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -7,7 +7,7 @@
 
 Name:     uboot-tools
 Version:  2024.04
-Release:  3%{?candidate:.%{candidate}}%{?dist}
+Release:  4%{?candidate:.%{candidate}}%{?dist}
 Epoch:    1
 Summary:  U-Boot utilities
 License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
@@ -131,7 +131,8 @@ Patch143: https://github.com/AsahiLinux/u-boot/commit/31c0e5e8576f726d97772b9492
 Patch144: https://github.com/AsahiLinux/u-boot/commit/ed7183f6d53b2df46752196ec3ff2d5bfe35d5b6.patch#/asahi-ed7183f6d53b2df46752196ec3ff2d5bfe35d5b6.patch
 # fixup! usb: Pass through timeout to drivers
 Patch145: https://github.com/AsahiLinux/u-boot/commit/d62ffcafa137b41385abe9d6272b4373e46a8602.patch#/asahi-d62ffcafa137b41385abe9d6272b4373e46a8602.patch
-
+# FEDORA: configs: apple: Disable AUTOBOOT_KEYED
+Patch146: https://github.com/AsahiLinux/u-boot/commit/c134629a8bc448e979967bf0632fdd5bb42ee1d7.patch#/asahi-c134629a8bc448e979967bf0632fdd5bb42ee1d7.patch
 
 BuildRequires:  bc
 BuildRequires:  bison
@@ -287,6 +288,9 @@ install -p -m 0755 builds/tools/env/fw_printenv %{buildroot}%{_bindir}
 %endif
 
 %changelog
+* Fri Apr 19 2024 Janne Grunau <janne-fdr@jannau.net> - 1:2024.04-4
+- restore boot behavior on Apple silicon systems (disable AUTOBOOT_KEYED)
+
 * Fri Apr 19 2024 Janne Grunau <janne-fdr@jannau.net> - 1:2024.04-3
 - fix dwc2 build