summaryrefslogtreecommitdiff
path: root/include/env_default.h
diff options
context:
space:
mode:
authorMarek Vasut <[email protected]>2025-09-03 16:20:52 +0200
committerTom Rini <[email protected]>2025-09-16 13:41:24 -0600
commit8db442e1a03b048fd34651b3e48ffdcc0bf7868b (patch)
tree458bff03f2a050bf796e4c1fc564d4c549d3b3d6 /include/env_default.h
parent7aa5271def6ba16ff4426aa164b7bb743673b3c3 (diff)
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 <[email protected]> Reviewed-by: Tom Rini <[email protected]>
Diffstat (limited to 'include/env_default.h')
-rw-r--r--include/env_default.h2
1 files changed, 1 insertions, 1 deletions
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