diff options
| author | Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> | 2014-05-26 19:51:22 +0530 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-05 14:44:56 -0400 |
| commit | ed6a5d4f880ac248530dbf64683b2257dbe54b64 (patch) | |
| tree | a5626f30ca1770687b7b1a26471730e8f62a0c75 | |
| parent | 4f0d1a2aea08b0dd62b0a1d82b36967470897101 (diff) | |
| download | talos-obmc-uboot-ed6a5d4f880ac248530dbf64683b2257dbe54b64.tar.gz talos-obmc-uboot-ed6a5d4f880ac248530dbf64683b2257dbe54b64.zip | |
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>
| -rw-r--r-- | common/env_eeprom.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 490ac731b3..905d39ac98 100644 --- 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 |
