From 088bec09fb4d24086004cad6259d43aebd511cd5 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Mon, 24 Nov 2025 13:26:54 +0100 Subject: [PATCH] boot/uboot: fix externally provided env file not used on 2025.10 fb5235239aad ("env: Rename DEFAULT_ENV_FILE to ENV_DEFAULT_ENV_TEXT_FILE") renamed the Kconfig symbols and thus we need to adapt the U-Boot package in Buildroot to support it. Fixes: 128c26f2875d ("boot/uboot: bump to version 2025.10") Reported-by: Ozan Durgut Signed-off-by: Quentin Schulz Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index b5c04215a4..936b8fd266 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -414,8 +414,12 @@ UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS= ifeq ($(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE_ENABLED),y) UBOOT_DEFAULT_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE)) define UBOOT_KCONFIG_DEFAULT_ENV_FILE + # Pre-2025.10 $(call KCONFIG_SET_OPT,CONFIG_USE_DEFAULT_ENV_FILE,y) $(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENV_FILE,"$(shell readlink -f $(UBOOT_DEFAULT_ENV_FILE))") + # 2025.10 and later + $(call KCONFIG_SET_OPT,CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE,y) + $(call KCONFIG_SET_OPT,CONFIG_ENV_DEFAULT_ENV_TEXT_FILE,"$(shell readlink -f $(UBOOT_DEFAULT_ENV_FILE))") endef endif endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY