From d7f8e985bae52bbd60b8062ad055505419102f02 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Tue, 11 Jun 2024 15:05:16 +0000
Subject: [PATCH] arm/u-boot: remove obsolete qemuarm patch

This has been obsoleted by "arm: enable support for QEMU firmware tables"
upstream, in v2024.04.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...rm-make-QFW-MMIO-implied-on-qemu-arm.patch | 34 -------------------
 meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend |  5 +--
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch

diff --git a/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch b/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch
deleted file mode 100644
index 8d3b32f8..00000000
--- a/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 67bb1f111c4668c4dfdc40547cb83fc6c1f010e9 Mon Sep 17 00:00:00 2001
-From: Jon Mason <jdmason@kudzu.us>
-Date: Thu, 26 Jan 2023 11:46:33 -0500
-Subject: [PATCH] qemu: arm: make QFW, MMIO implied on qemu-arm
-
-There are instances when one would not want QFW enabled, like running
-alternative firmware.  Make this choice optional instead of forced by
-using the implied keyword.
-
-Signed-off-by: Jon Mason <jdmason@kudzu.us>
-Upstream-Status: Pending [Not submitted to upstream yet]
-
----
- board/emulation/qemu-arm/Kconfig | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig
-index ed9949651c4b..93f6f74d5bcc 100644
---- a/board/emulation/qemu-arm/Kconfig
-+++ b/board/emulation/qemu-arm/Kconfig
-@@ -5,8 +5,8 @@ config TEXT_BASE
- 
- config BOARD_SPECIFIC_OPTIONS # dummy
- 	def_bool y
--	select CMD_QFW
--	select QFW_MMIO
-+	imply CMD_QFW
-+	imply QFW_MMIO
- 	imply VIRTIO_MMIO
- 	imply VIRTIO_PCI
- 	imply VIRTIO_NET
--- 
-2.30.2
-
diff --git a/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend
index 58d66e1d..0683a783 100644
--- a/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,7 +1,4 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI:append:qemuarm64-secureboot = " file://qemuarm64.cfg"
-SRC_URI:append:qemuarm-secureboot = " \
-    file://0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch \
-    file://qemuarm.cfg \
-    "
+SRC_URI:append:qemuarm-secureboot = " file://qemuarm.cfg"