Complete migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT, include in environment

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

diff --git a/include/env_default.h b/include/env_default.h
index a672471..4e461c8 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -10,6 +10,10 @@
 #include <env_callback.h>
 #include <linux/stringify.h>
 
+#ifndef USE_HOSTCC
+#include <generated/environment.h>
+#endif
+
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
 env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
        ENV_CRC,        /* CRC Sum */
@@ -37,12 +41,6 @@ const char default_environment[] = {
 #ifdef CONFIG_BOOTCOMMAND
        "bootcmd="      CONFIG_BOOTCOMMAND              "\0"
 #endif
-#ifdef CONFIG_RAMBOOTCOMMAND
-       "ramboot="      CONFIG_RAMBOOTCOMMAND           "\0"
-#endif
-#ifdef CONFIG_NFSBOOTCOMMAND
-       "nfsboot="      CONFIG_NFSBOOTCOMMAND           "\0"
-#endif
 #if defined(CONFIG_BOOTDELAY)
        "bootdelay="    __stringify(CONFIG_BOOTDELAY)   "\0"
 #endif
@@ -61,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"
@@ -79,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
@@ -110,6 +108,16 @@ 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
+       /* This is created in the Makefile */
+       CONFIG_EXTRA_ENV_TEXT
+#endif
 #ifdef CONFIG_EXTRA_ENV_SETTINGS
        CONFIG_EXTRA_ENV_SETTINGS
 #endif
@@ -121,3 +129,9 @@ const char default_environment[] = {
        }
 #endif
 };
+
+#if !defined(USE_HOSTCC) && !defined(DEFAULT_ENV_INSTANCE_EMBEDDED)
+#include <env_internal.h>
+static_assert(sizeof(default_environment) <= ENV_SIZE,
+             "Default environment is too large");
+#endif