[Buildroot] [PATCH] boot/uboot: fix externally provided env file not used on 2025.10

[Buildroot] [PATCH] boot/uboot: fix externally provided env file not used on 2025.10

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

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 <ozandurgut.2001@hotmail.com>
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
Only roughly build tested, warp7_defconfig modified:
- to use Kconfig for U-Boot,
- to add a dummy environment text file,

Built 2025.07 and 2025.10 and checked with make uboot-menuconfig that
the variable in U-Boot was appropriately set.
---
 boot/uboot/uboot.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 7bd0937df2..8dad710bf3 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -409,8 +409,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

---
base-commit: c8cb1a238de5a803228f12ad32b36cae2acfc778
change-id: 20251124-uboot-env-rename-f88169496f13

Best regards,
-- 
Quentin Schulz <quentin.schulz@cherry.de>

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] boot/uboot: fix externally provided env file not used on 2025.10

[Thomas Petazzoni via buildroot]

On Mon, 24 Nov 2025 13:26:54 +0100
Quentin Schulz <foss+buildroot@0leil.net> wrote:

> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> 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 <ozandurgut.2001@hotmail.com>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
> Only roughly build tested, warp7_defconfig modified:
> - to use Kconfig for U-Boot,
> - to add a dummy environment text file,

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] boot/uboot: fix externally provided env file not used on 2025.10

[Arnout Vandecappelle via buildroot]

In reply of:
> 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 <ozandurgut.2001@hotmail.com>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>

Applied to 2025.11.x. Thanks

> ---
> Only roughly build tested, warp7_defconfig modified:
> - to use Kconfig for U-Boot,
> - to add a dummy environment text file,
> 
> Built 2025.07 and 2025.10 and checked with make uboot-menuconfig that
> the variable in U-Boot was appropriately set.
> ---
>  boot/uboot/uboot.mk | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 7bd0937df2..8dad710bf3 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -409,8 +409,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
> 
> ---
> base-commit: c8cb1a238de5a803228f12ad32b36cae2acfc778
> change-id: 20251124-uboot-env-rename-f88169496f13
> 
> Best regards,
> -- 
> Quentin Schulz <quentin.schulz@cherry.de>
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot