From: Tomasz Maciej Nowak <[email protected]> Maintenence bump, no new features.
Signed-off-by: Tomasz Maciej Nowak <[email protected]> --- package/boot/uboot-tegra/Makefile | 6 +- ...ripts-dtc-drop-yaml-in-DT-validation.patch | 75 +++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 package/boot/uboot-tegra/patches/001-scripts-dtc-drop-yaml-in-DT-validation.patch diff --git a/package/boot/uboot-tegra/Makefile b/package/boot/uboot-tegra/Makefile index d34b11b64541..26f430662a48 100644 --- a/package/boot/uboot-tegra/Makefile +++ b/package/boot/uboot-tegra/Makefile @@ -6,10 +6,10 @@ # include $(TOPDIR)/rules.mk -PKG_VERSION := 2025.04 -PKG_RELEASE:=1 +PKG_VERSION := 2026.04 +PKG_RELEASE := 1 -PKG_HASH := 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 +PKG_HASH := ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd PKG_MAINTAINER := Tomasz Maciej Nowak <[email protected]> diff --git a/package/boot/uboot-tegra/patches/001-scripts-dtc-drop-yaml-in-DT-validation.patch b/package/boot/uboot-tegra/patches/001-scripts-dtc-drop-yaml-in-DT-validation.patch new file mode 100644 index 000000000000..8214328e8512 --- /dev/null +++ b/package/boot/uboot-tegra/patches/001-scripts-dtc-drop-yaml-in-DT-validation.patch @@ -0,0 +1,75 @@ +From 8ef8dee4f3a2b2021decfefd853dbd2a1632b77f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Marcos=20Costa?= <[email protected]> +Date: Wed, 29 Apr 2026 16:46:15 +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]> +Acked-by: Quentin Schulz <[email protected]> +--- + scripts/Makefile.lib | 6 ------ + scripts/dtc/Makefile | 8 -------- + scripts/dtc/update-dtc-source.sh | 2 +- + 3 files changed, 1 insertion(+), 15 deletions(-) + +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -86,12 +86,6 @@ base-dtb-y := $(foreach m, $(multi-dtb-y + 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)) +--- a/scripts/dtc/Makefile ++++ b/scripts/dtc/Makefile +@@ -17,15 +17,7 @@ fdtoverlay-objs := $(libfdt) fdtoverlay. + # 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) +--- 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.54.0
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
