From: Marek Vasut Date: Wed, 3 Sep 2025 14:20:52 +0000 (+0200) Subject: env: Remove usb_ignorelist and env_fdt_path from ifdef CONFIG_ENV_VARS_UBOOT_CONFIG X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8db442e1a03b048fd34651b3e48ffdcc0bf7868b;p=thirdparty%2Fu-boot.git env: Remove usb_ignorelist and env_fdt_path from ifdef CONFIG_ENV_VARS_UBOOT_CONFIG The CONFIG_ENV_VARS_UBOOT_CONFIG should protect only U-Boot configuration variables in environment, those are arch, cpu, board, board_name, vendor, soc. It should certainly not hide usb_ignorelist or env_fdt_path from the environment. Fix it. Signed-off-by: Marek Vasut Reviewed-by: Tom Rini --- diff --git a/include/env_default.h b/include/env_default.h index ae2cfbcbc45..7f8dc1c35a7 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -97,6 +97,7 @@ const char default_environment[] = { #ifdef CONFIG_SYS_SOC "soc=" CONFIG_SYS_SOC "\0" #endif +#endif #ifdef CONFIG_USB_HOST "usb_ignorelist=" #ifdef CONFIG_USB_KEYBOARD @@ -111,7 +112,6 @@ const char default_environment[] = { #ifdef CONFIG_ENV_IMPORT_FDT "env_fdt_path=" CONFIG_ENV_FDT_PATH "\0" #endif -#endif #if defined(CONFIG_BOOTCOUNT_BOOTLIMIT) && (CONFIG_BOOTCOUNT_BOOTLIMIT > 0) "bootlimit=" __stringify(CONFIG_BOOTCOUNT_BOOTLIMIT)"\0" #endif