Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[platform/kernel/u-boot.git] / include / env_default.h

diff --git a/include/env_default.h b/include/env_default.h
index 21afd7f..4e461c8 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -59,8 +59,8 @@ const char default_environment[] = {
 #ifdef CONFIG_SERVERIP
        "serverip="     __stringify(CONFIG_SERVERIP)    "\0"
 #endif
-#ifdef CONFIG_SYS_AUTOLOAD
-       "autoload="     CONFIG_SYS_AUTOLOAD             "\0"
+#ifdef CONFIG_SYS_DISABLE_AUTOLOAD
+       "autoload=0\0"
 #endif
 #ifdef CONFIG_PREBOOT
        "preboot="      CONFIG_PREBOOT                  "\0"
@@ -77,7 +77,7 @@ const char default_environment[] = {
 #ifdef CONFIG_HOSTNAME
        "hostname="     CONFIG_HOSTNAME "\0"
 #endif
-#ifdef CONFIG_BOOTFILE
+#ifdef CONFIG_USE_BOOTFILE
        "bootfile="     CONFIG_BOOTFILE                 "\0"
 #endif
 #ifdef CONFIG_SYS_LOAD_ADDR
@@ -108,10 +108,13 @@ const char default_environment[] = {
 #if defined(CONFIG_BOOTCOUNT_BOOTLIMIT) && (CONFIG_BOOTCOUNT_BOOTLIMIT > 0)
        "bootlimit="    __stringify(CONFIG_BOOTCOUNT_BOOTLIMIT)"\0"
 #endif
+#ifdef CONFIG_MTDIDS_DEFAULT
+        "mtdids="      CONFIG_MTDIDS_DEFAULT           "\0"
+#endif
+#ifdef CONFIG_MTDPARTS_DEFAULT
+       "mtdparts="     CONFIG_MTDPARTS_DEFAULT         "\0"
+#endif
 #ifdef CONFIG_EXTRA_ENV_TEXT
-# ifdef CONFIG_EXTRA_ENV_SETTINGS
-# error "Your board uses a text-file environment, so must not define CONFIG_EXTRA_ENV_SETTINGS"
-# endif
        /* This is created in the Makefile */
        CONFIG_EXTRA_ENV_TEXT
 #endif