env_eeprom: Assign default environment during board_init_f

Assign default environment and set env valid during board_init_f
before relocation as the actual environment will be read from eeprom
later.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Acked-by: Michal Simek <monstr@monstr.eu>

diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 490ac731b31da018a4c3e12d0941e71a35011ec9..905d39ac9868357657a03ff458d71f709c2389fe 100644 (file)
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -147,6 +147,7 @@ int saveenv(void)
 #ifdef CONFIG_ENV_OFFSET_REDUND
 int env_init(void)
 {
+#ifdef ENV_IS_EMBEDDED
        ulong len, crc[2], crc_tmp;
        unsigned int off, off_env[2];
        uchar buf[64], flags[2];
@@ -212,12 +213,16 @@ int env_init(void)
                gd->env_addr = off_env[1] + offsetof(env_t, data);
        else if (gd->env_valid == 1)
                gd->env_addr = off_env[0] + offsetof(env_t, data);
-
+#else
+       gd->env_addr = (ulong)&default_environment[0];
+       gd->env_valid = 1;
+#endif
        return 0;
 }
 #else
 int env_init(void)
 {
+#ifdef ENV_IS_EMBEDDED
        ulong crc, len, new;
        unsigned off;
        uchar buf[64];
@@ -250,7 +255,10 @@ int env_init(void)
                gd->env_addr    = 0;
                gd->env_valid   = 0;
        }
-
+#else
+       gd->env_addr = (ulong)&default_environment[0];
+       gd->env_valid = 1;
+#endif
        return 0;
 }
 #endif