From: Fabio Estevam <[email protected]> Remove the local patch as it has been upstreamed.
Signed-off-by: Fabio Estevam <[email protected]> --- ...ripts-dtc-drop-yaml-in-DT-validation.patch | 85 ------------------- meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +- .../u-boot/u-boot-tools_2026.04.bb | 4 - .../u-boot/u-boot-tools_2026.07.bb | 2 + .../{u-boot_2026.04.bb => u-boot_2026.07.bb} | 2 - 5 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/0001-scripts-dtc-drop-yaml-in-DT-validation.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-tools_2026.07.bb rename meta/recipes-bsp/u-boot/{u-boot_2026.04.bb => u-boot_2026.07.bb} (93%) diff --git a/meta/recipes-bsp/u-boot/files/0001-scripts-dtc-drop-yaml-in-DT-validation.patch b/meta/recipes-bsp/u-boot/files/0001-scripts-dtc-drop-yaml-in-DT-validation.patch deleted file mode 100644 index 9c1adc8faf..0000000000 --- a/meta/recipes-bsp/u-boot/files/0001-scripts-dtc-drop-yaml-in-DT-validation.patch +++ /dev/null @@ -1,85 +0,0 @@ -From e77402000f978561ff2afe405aa9e5c9037a8717 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=A3o=20Marcos=20Costa?= <[email protected]> -Date: Wed, 29 Apr 2026 15:22:25 +0200 -Subject: [PATCH] scripts/dtc: drop yaml in DT validation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The build issues found in dtc/yamltree were partially mitigated by a -previous commit (807bcd844a: "scripts/dtc: Fix pkg-config behavior under -sysroot"), but upstream dtc simply disabled yaml, and the same should be -done here in order to permanently avoid those issues. - -Backport the change below from Linux v5.18 [1]: - -ef8795f3f1c ("dt-bindings: kbuild: Use DTB files for validation") - -I tested this patch with a couple Yocto builds: u-boot and u-boot-tools, -using the current master branch (rev. "c53b0708f9"), having removed -libyaml-native from u-boot-tools's dependencies. - -[1] https://git.kernel.org/linus/ef8795f3f1ce - -Signed-off-by: João Marcos Costa <[email protected]> - -Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/8ef8dee4f3a2b2021decfefd853dbd2a1632b77f] ---- - scripts/Makefile.lib | 6 ------ - scripts/dtc/Makefile | 8 -------- - scripts/dtc/update-dtc-source.sh | 2 +- - 3 files changed, 1 insertion(+), 15 deletions(-) - -diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index b8969b7de54..d66f1ed13b1 100644 ---- a/scripts/Makefile.lib -+++ b/scripts/Makefile.lib -@@ -86,12 +86,6 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, - extra-y += $(dtb-y) - extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-) - --# U-Boot specific --ifneq ($(CHECK_DTBS),) --extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y)) --extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-)) --endif -- - # Add subdir path - - extra-y := $(addprefix $(obj)/,$(extra-y)) -diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile -index 6f309b37e08..2ba8dba03be 100644 ---- a/scripts/dtc/Makefile -+++ b/scripts/dtc/Makefile -@@ -17,15 +17,7 @@ fdtoverlay-objs := $(libfdt) fdtoverlay.o util.o - # Source files need to get at the userspace version of libfdt_env.h to compile - HOST_EXTRACFLAGS := -I$(srctree)/$(src)/libfdt - --ifeq ($(wildcard $(PKG_CONFIG_SYSROOT_DIR)/usr/include/yaml.h),) - HOST_EXTRACFLAGS += -DNO_YAML --else --dtc-objs += yamltree.o --# To include <yaml.h> installed in a non-default path --HOSTCFLAGS_yamltree.o := $(shell pkg-config --cflags yaml-0.1) --# To link libyaml installed in a non-default path --HOSTLDLIBS_dtc := $(shell pkg-config --libs yaml-0.1) --endif - - # Generated files need one more search path to include headers in source tree - HOSTCFLAGS_dtc-lexer.lex.o := -I$(src) -diff --git a/scripts/dtc/update-dtc-source.sh b/scripts/dtc/update-dtc-source.sh -index 32ff17ffd08..94627541533 100755 ---- a/scripts/dtc/update-dtc-source.sh -+++ b/scripts/dtc/update-dtc-source.sh -@@ -32,7 +32,7 @@ DTC_UPSTREAM_PATH=`pwd`/../dtc - DTC_LINUX_PATH=`pwd`/scripts/dtc - - DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \ -- srcpos.h treesource.c util.c util.h version_gen.h yamltree.c \ -+ srcpos.h treesource.c util.c util.h version_gen.h \ - dtc-lexer.l dtc-parser.y" - LIBFDT_SOURCE="fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \ - fdt_overlay.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c \ --- -2.47.0 - diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 574768b9f8..229d779498 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "88dc2788777babfd6322fa655df549a019aa1e69" +SRCREV = "ece349ade2973e220f524ce59e59711cc919263f" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb deleted file mode 100644 index 6c3ef7efd1..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb +++ /dev/null @@ -1,4 +0,0 @@ -require u-boot-common.inc -require u-boot-tools.inc - -SRC_URI += "file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch" diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2026.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2026.07.bb new file mode 100644 index 0000000000..7eaf721ca8 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2026.07.bb @@ -0,0 +1,2 @@ +require u-boot-common.inc +require u-boot-tools.inc diff --git a/meta/recipes-bsp/u-boot/u-boot_2026.04.bb b/meta/recipes-bsp/u-boot/u-boot_2026.07.bb similarity index 93% rename from meta/recipes-bsp/u-boot/u-boot_2026.04.bb rename to meta/recipes-bsp/u-boot/u-boot_2026.07.bb index b6345c8875..eed5127004 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2026.04.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2026.07.bb @@ -3,8 +3,6 @@ require u-boot.inc DEPENDS += "bc-native dtc-native gnutls-native python3-pyelftools-native" -SRC_URI += "file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch" - # workarounds for aarch64 kvm qemu boot regressions SRC_URI:append:qemuarm64 = " file://disable-CONFIG_BLOBLIST.cfg" SRC_URI:append:genericarm64 = " file://disable-CONFIG_BLOBLIST.cfg" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#241090): https://lists.openembedded.org/g/openembedded-core/message/241090 Mute This Topic: https://lists.openembedded.org/mt/120297466/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
