Convert CONFIG_SYS_NAND_PAGE_2K et al to Kconfig

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

diff --git a/include/env_default.h b/include/env_default.h
index 7113e08..7c9c00a 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -59,10 +59,10 @@ 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
+#ifdef CONFIG_PREBOOT_DEFINED
        "preboot="      CONFIG_PREBOOT                  "\0"
 #endif
 #ifdef CONFIG_ROOTPATH
@@ -108,6 +108,12 @@ 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