From dfb58eeeab676b196c273ab6e4041e94cee10d1d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 5 Jun 2025 17:06:24 +0100 Subject: u-boot: move arm64 disabling fragments to versioned recipe More than just the u-boot_2025.04.bb includes u-boot-common.inc, such as u-boot_2023.07.02.bb in meta-arm. To avoid other recipes having to carry patches that may not affect them, move the files to be specific to the recipe itself. (From OE-Core rev: 3bb0f87a1d13f86836dc44adee5621c3146863d3) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot-common.inc | 4 ---- meta/recipes-bsp/u-boot/u-boot_2025.04.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 6cd9c39430..fd1eab5cdd 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -16,10 +16,6 @@ SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" -# 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" diff --git a/meta/recipes-bsp/u-boot/u-boot_2025.04.bb b/meta/recipes-bsp/u-boot/u-boot_2025.04.bb index db8b2d58b4..89e964f627 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2025.04.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2025.04.bb @@ -2,3 +2,7 @@ require u-boot-common.inc require u-boot.inc DEPENDS += "bc-native dtc-native gnutls-native python3-pyelftools-native" + +# 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" -- cgit v1.2.3-54-g00ecf