global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

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

diff --git a/include/env_default.h b/include/env_default.h
index 8a0c305..66e203e 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -19,6 +19,8 @@ env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
        {
 #elif defined(DEFAULT_ENV_INSTANCE_STATIC)
 static char default_environment[] = {
+#elif defined(DEFAULT_ENV_IS_RW)
+uchar default_environment[] = {
 #else
 const uchar default_environment[] = {
 #endif
@@ -80,8 +82,8 @@ const uchar default_environment[] = {
 #ifdef CONFIG_BOOTFILE
        "bootfile="     CONFIG_BOOTFILE                 "\0"
 #endif
-#ifdef CONFIG_LOADADDR
-       "loadaddr="     __stringify(CONFIG_LOADADDR)    "\0"
+#ifdef CONFIG_SYS_LOAD_ADDR
+       "loadaddr="     __stringify(CONFIG_SYS_LOAD_ADDR)"\0"
 #endif
 #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
        "pcidelay="     __stringify(CONFIG_PCI_BOOTDELAY)"\0"
@@ -101,6 +103,9 @@ const uchar default_environment[] = {
 #ifdef CONFIG_SYS_SOC
        "soc="          CONFIG_SYS_SOC                  "\0"
 #endif
+#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"