This reverts commit ed6a5d4f880ac248530dbf64683b2257dbe54b64.
The original patch uses ENV_IS_EMBEDDED to decide if the default
environment should be used or the one actually read from EEPROM. The
code in environment.h allows setting of ENV_IS_EMBEDDED only for
a subset of flash types. EEPROM is not included in that list.
So basically reading environment from I2C EEPROM is broken now.
I propose to revert the patch.
Signed-off-by: Ludger Dreier <ludger.dre...@keymile.com>
---
common/env_eeprom.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 905d39a..490ac73 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -147,7 +147,6 @@ 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];
@@ -213,16 +212,12 @@ 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];
@@ -255,10 +250,7 @@ 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
--
1.7.0.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
