From ade1069ece5f964edaa7115681d8dbc484ff2c81 Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Tue, 3 Jun 2025 15:29:37 +0300 Subject: [PATCH] u-boot: disable USB support on qemuarm64 and genericarm64 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 Signed-off-by: Richard Purdie --- 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 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 00000000000..1d2509982be --- /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 a77c49cb8b7..6cd9c39430f 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" -- 2.47.3