Accepting request 873078 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/873078
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=128

0032-configs-BPI-R2-Disable-EFI-Grub-wor.patch

@@ -0,0 +1,23 @@
+From b35caa4e303fa4ad75fe55e803c5f7414b301d78 Mon Sep 17 00:00:00 2001
+From: Matthias Brugger <mbrugger@suse.com>
+Date: Tue, 16 Feb 2021 20:54:07 +0100
+Subject: [PATCH] configs: BPI-R2: Disable EFI Grub workaround
+
+The EFI Grub workaround on BananaPi R2 slows down the boot process to
+the point, that the watchdog will trigger a reboot before the kernel can
+reset it. Fix this by disabeling the workaround.
+
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ configs/mt7623n_bpir2_defconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig
+index d36ff560cf..fb20cb1832 100644
+--- a/configs/mt7623n_bpir2_defconfig
++++ b/configs/mt7623n_bpir2_defconfig
+@@ -53,3 +53,4 @@ CONFIG_TIMER=y
+ CONFIG_MTK_TIMER=y
+ CONFIG_WDT_MTK=y
+ CONFIG_LZMA=y
++# CONFIG_EFI_GRUB_ARM32_WORKAROUND is not set

0033-configs-RPi2-Disable-EFI-Grub-worka.patch

@@ -0,0 +1,23 @@
+From 989046a0aac8e7cb3db18e3cbc8a1aac82b82079 Mon Sep 17 00:00:00 2001
+From: Matthias Brugger <mbrugger@suse.com>
+Date: Tue, 16 Feb 2021 20:54:08 +0100
+Subject: [PATCH] configs: RPi2: Disable EFI Grub workaround
+
+The EFI Grub workaround isn't needed with Grub version 2.04 or higher.
+This version was published over a year ago, so disable the workaround
+to reduce boot time.
+
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ configs/rpi_2_defconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
+index e546c3e7be..219c61b1f5 100644
+--- a/configs/rpi_2_defconfig
++++ b/configs/rpi_2_defconfig
+@@ -42,3 +42,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+ CONFIG_PHYS_TO_BUS=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
++# CONFIG_EFI_GRUB_ARM32_WORKAROUND is not set

u-boot.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 16 19:58:28 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
+
+Fix boot for BananaPi R2 (bsc#1180732).
+Speed up boot time for RPi2.
+
+Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2021.01
+* Patches added:
+  0032-configs-BPI-R2-Disable-EFI-Grub-wor.patch
+  0033-configs-RPi2-Disable-EFI-Grub-worka.patch
+
 -------------------------------------------------------------------
 Tue Feb 16 17:10:57 UTC 2021 - Andreas Schwab <schwab@suse.de>
 

u-boot.spec

@@ -251,6 +251,8 @@ Patch0028:      0028-usb-xhci-pci-Add-DM_FLAG_OS_PREPARE.patch
 Patch0029:      0029-pci-brcmstb-Cleanup-controller-stat.patch
 Patch0030:      0030-fs-btrfs-Select-SHA256-in-Kconfig.patch
 Patch0031:      0031-efi_loader-Avoid-emitting-efi_var_b.patch
+Patch0032:      0032-configs-BPI-R2-Disable-EFI-Grub-wor.patch
+Patch0033:      0033-configs-RPi2-Disable-EFI-Grub-worka.patch
 # Patches: end
 BuildRequires:  bc
 BuildRequires:  bison