Commit 5e97f3c1e2cf ("u-boot-tools: drop yaml in DT validation") added the
backport through SRC_URI_RISCV, so only RISC-V u-boot builds picked it up.
This issue is because the v1 of the patch was merged instead the v2 (which
is also not fully correct as it is not patching u-boot-tools). Drop the
patch from SRC_URI_RISCV and move it to u-boot-common.inc so it is applied
consistently to both u-boot and u-boot-tools.
Fixes: 5e97f3c1e2cf ("u-boot-tools: drop yaml in DT validation")
Signed-off-by: Ricardo Salveti <[email protected]>
---
meta/recipes-bsp/u-boot/u-boot-common.inc | 5 ++++-
meta/recipes-bsp/u-boot/u-boot_2026.04.bb | 1 -
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc
b/meta/recipes-bsp/u-boot/u-boot-common.inc
index 574768b9f8..15e94a4e37 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -14,7 +14,10 @@ PE = "1"
# repo during parse
SRCREV = "88dc2788777babfd6322fa655df549a019aa1e69"
-SRC_URI =
"git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}"
+SRC_URI = "\
+
git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV} \
+ file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch \
+"
B = "${WORKDIR}/build"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
b/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
index 9f09d91daa..5259fd5832 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
@@ -14,7 +14,6 @@ SRC_URI_RISCV = "\
${@bb.utils.contains ("TUNE_FEATURES", "d",
"file://u-boot-riscv-isa_d.cfg", "", d)} \
${@bb.utils.contains_any("TUNE_FEATURES", "b zbb",
"file://u-boot-riscv-isa_zbb.cfg", "", d)} \
${@bb.utils.contains ("TUNE_FEATURES", "zicbom",
"file://u-boot-riscv-isa_zicbom.cfg", "", d)} \
- file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch \
"
SRC_URI:append:riscv32 = "${SRC_URI_RISCV}"
--
2.53.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#236619):
https://lists.openembedded.org/g/openembedded-core/message/236619
Mute This Topic: https://lists.openembedded.org/mt/119204092/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
