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 <marek.vasut+renesas@mailbox.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/include/env_default.h b/include/env_default.h
index ae2cfbcbc4513aa5c3ba235c69757eb530e41429..7f8dc1c35a7428f9759c1092e843ba455227d3a5 100644 (file)
--- 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