diff --git a/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf
index cb54fe9..db02dc6 100644
--- a/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf
+++ b/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf
@@ -23,4 +23,4 @@
 MACHINE_FEATURES += "optee-ftpm"
 
 PREFERRED_VERSION_optee-os ?= "3.18.%"
-PREFERRED_VERSION_u-boot ?= "2022.10"
+
diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch
new file mode 100644
index 0000000..8d3b32f
--- /dev/null
+++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch
@@ -0,0 +1,34 @@
+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/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg
index db8dfec..82c25e2 100644
--- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg
+++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg
@@ -1,6 +1,7 @@
 # This must match the address that TF-A jumps to for BL33
-CONFIG_SYS_TEXT_BASE=0x60000000
+CONFIG_TEXT_BASE=0x60000000
 CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_ENV_IS_IN_FLASH is not set
 # CONFIG_MTD is not set
 # CONFIG_MTD_NOR_FLASH is not set
+# CONFIG_CMD_QFW is not set
diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend
index 0683a78..58d66e1 100644
--- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,4 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI:append:qemuarm64-secureboot = " file://qemuarm64.cfg"
-SRC_URI:append:qemuarm-secureboot = " file://qemuarm.cfg"
+SRC_URI:append:qemuarm-secureboot = " \
+    file://0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch \
+    file://qemuarm.cfg \
+    "
diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb
deleted file mode 100644
index 905ae55..0000000
--- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-DESCRIPTION = "U-Boot, a boot loader for Embedded boards based on PowerPC, \
-ARM, MIPS and several other processors, which can be installed in a boot \
-ROM and used to initialize and test the hardware or to download and run \
-application code."
-SECTION = "bootloaders"
-DEPENDS += "flex-native bison-native"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
-PE = "1"
-
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "4debc57a3da6c3f4d3f89a637e99206f4cea0a96"
-
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
-          "
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-do_configure[cleandirs] = "${B}"
-
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "bc-native dtc-native gnutls-native"