global: Migrate CONFIG_STACKBASE to CFG

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

diff --git a/include/env_default.h b/include/env_default.h
index 401e84e..c0df39d 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -41,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
@@ -59,31 +53,31 @@ const char default_environment[] = {
 #ifdef CONFIG_ETHPRIME
        "ethprime="     CONFIG_ETHPRIME                 "\0"
 #endif
-#ifdef CONFIG_IPADDR
-       "ipaddr="       __stringify(CONFIG_IPADDR)      "\0"
+#ifdef CONFIG_USE_IPADDR
+       "ipaddr="       CONFIG_IPADDR                   "\0"
 #endif
-#ifdef CONFIG_SERVERIP
-       "serverip="     __stringify(CONFIG_SERVERIP)    "\0"
+#ifdef CONFIG_USE_SERVERIP
+       "serverip="     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
+#ifdef CONFIG_PREBOOT_DEFINED
        "preboot="      CONFIG_PREBOOT                  "\0"
 #endif
-#ifdef CONFIG_ROOTPATH
+#ifdef CONFIG_USE_ROOTPATH
        "rootpath="     CONFIG_ROOTPATH                 "\0"
 #endif
-#ifdef CONFIG_GATEWAYIP
-       "gatewayip="    __stringify(CONFIG_GATEWAYIP)   "\0"
+#ifdef CONFIG_USE_GATEWAYIP
+       "gatewayip="    CONFIG_GATEWAYIP                "\0"
 #endif
-#ifdef CONFIG_NETMASK
-       "netmask="      __stringify(CONFIG_NETMASK)     "\0"
+#ifdef CONFIG_USE_NETMASK
+       "netmask="      CONFIG_NETMASK                  "\0"
 #endif
-#ifdef CONFIG_HOSTNAME
-       "hostname="     CONFIG_HOSTNAME "\0"
+#ifdef CONFIG_USE_HOSTNAME
+       "hostname="     CONFIG_HOSTNAME                 "\0"
 #endif
-#ifdef CONFIG_BOOTFILE
+#ifdef CONFIG_USE_BOOTFILE
        "bootfile="     CONFIG_BOOTFILE                 "\0"
 #endif
 #ifdef CONFIG_SYS_LOAD_ADDR
@@ -114,15 +108,18 @@ 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
-#ifdef CONFIG_EXTRA_ENV_SETTINGS
-       CONFIG_EXTRA_ENV_SETTINGS
+#ifdef CFG_EXTRA_ENV_SETTINGS
+       CFG_EXTRA_ENV_SETTINGS
 #endif
        "\0"
 #else /* CONFIG_USE_DEFAULT_ENV_FILE */