]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
env_eeprom: Assign default environment during board_init_f
authorSiva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Fri, 14 Mar 2014 13:21:20 +0000 (18:51 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 17 Mar 2014 13:34:16 +0000 (14:34 +0100)
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>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
common/env_eeprom.c

index 0db2bb63fe1d9671b7e586a88e9b4f08063fae37..a4020bc02036283deb32cb697ec1cbe74e0429c6 100644 (file)
@@ -224,6 +224,7 @@ int env_init(void)
 #else
 int env_init(void)
 {
+#ifdef ENV_IS_EMBEDDED
        ulong crc, len, new;
        unsigned off;
        uchar buf[64];
@@ -256,6 +257,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;
 }