| Message ID | 20250605160624.1029863-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | u-boot: move arm64 disabling fragments to versioned recipe | expand |
Hi Ross, On 6/5/25 6:06 PM, Ross Burton via lists.openembedded.org wrote: > 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. > Oh yes, we do in our BSP layer for example. Thanks for catching this :) > To avoid other recipes having to carry patches that may not affect them, > move the files to be specific to the recipe itself. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-bsp/u-boot/u-boot-common.inc | 4 ---- > meta/recipes-bsp/u-boot/u-boot_2025.04.bb | 4 ++++ The u-boot-tools recipe also includes the u-boot-common.inc so we would be losing the patches in that recipe. I would assume CONFIG_BLOBLIST and CONFIG_USB in the defconfig fragment wouldn't matter for tools, but maybe...? What about adding it to u-boot-tools_2025.04.bb so we don't have to worry about that :) ? Aside from this, looks good to me Cheers, Quentin
On 6 Jun 2025, at 09:35, Quentin Schulz <quentin.schulz@cherry.de> wrote: > > The u-boot-tools recipe also includes the u-boot-common.inc so we would be losing the patches in that recipe. I would assume CONFIG_BLOBLIST and CONFIG_USB in the defconfig fragment wouldn't matter for tools, but maybe...? What about adding it to u-boot-tools_2025.04.bb so we don't have to worry about that :) ? My understanding is that they’re unrelated to the tools, which is why I only changed the actual firmware. Ross
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 6cd9c39430f..fd1eab5cdde 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 db8b2d58b46..89e964f627e 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"
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. Signed-off-by: Ross Burton <ross.burton@arm.com> --- 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(-)