diff mbox series

[v6,2/4] u-boot: disable USB support on qemuarm64 and genericarm64

Message ID 20250603122939.1027947-2-mikko.rapeli@linaro.org
State Accepted, archived
Commit ade1069ece5f964edaa7115681d8dbc484ff2c81
Headers show
Series [v6,1/4] u-boot: disable CONFIG_BLOBLIST on genericarm64 and qemuarm64 | expand

Commit Message

Mikko Rapeli June 3, 2025, 12:29 p.m. UTC 
qemu USB devices under KVM currently cause reset loop
in u-boot. If u-boot USB support is disabled then
u-boot just ignores the qemu USB devices which
then work with Linux kernel as before.

Issue has been reported to u-boot upstream in:

https://lists.denx.de/pipermail/u-boot/2025-June/591233.html

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 meta/recipes-bsp/u-boot/files/disable_CONFIG_USB.cfg | 1 +
 meta/recipes-bsp/u-boot/u-boot-common.inc            | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-bsp/u-boot/files/disable_CONFIG_USB.cfg

v6: changed from qemu options override "qemuarm64.conf: allow overriding QB_OPT_APPEND"
    to disabling USB support in u-boot

v5: https://lists.openembedded.org/g/openembedded-core/topic/113322399#msg217801

v4: https://lists.openembedded.org/g/openembedded-core/topic/113306017#msg217349
diff mbox series

Patch

diff --git a/meta/recipes-bsp/u-boot/files/disable_CONFIG_USB.cfg b/meta/recipes-bsp/u-boot/files/disable_CONFIG_USB.cfg
new file mode 100644
index 000000000000..1d2509982be1
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/disable_CONFIG_USB.cfg
@@ -0,0 +1 @@ 
+# CONFIG_USB is not set
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index a77c49cb8b7f..6cd9c39430f4 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -16,9 +16,9 @@  SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}"
 
-# workaround for aarch64 kvm qemu boot regression
-SRC_URI:append:qemuarm64 = " file://disable-CONFIG_BLOBLIST.cfg"
-SRC_URI:append:genericarm64 = " file://disable-CONFIG_BLOBLIST.cfg"
+# workarounds for aarch64 kvm qemu boot regressions
+SRC_URI:append:qemuarm64 = " file://disable-CONFIG_BLOBLIST.cfg file://disable_CONFIG_USB.cfg"
+SRC_URI:append:genericarm64 = " file://disable-CONFIG_BLOBLIST.cfg file://disable_CONFIG_USB.cfg"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"