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]> --- Cc: Joe Hershberger <[email protected]> Cc: Rasmus Villemoes <[email protected]> Cc: Tom Rini <[email protected]> Cc: [email protected] --- V2: Drop the tab->space hunk --- include/env_default.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.50.1
