projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: stm32mp: improve the error message for smc
[oweals/u-boot.git]
/
env
/
eeprom.c
diff --git
a/env/eeprom.c
b/env/eeprom.c
index 8d82cf892ce5d83b7c67d00dfdb685b7fce7e920..e8126cfe3974695787e5cd11fe00fc9860d29406 100644
(file)
--- a/
env/eeprom.c
+++ b/
env/eeprom.c
@@
-9,9
+9,11
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
+#include <eeprom.h>
#include <env.h>
#include <env.h>
-#include <env
ironment
.h>
+#include <env
_internal
.h>
#include <linux/stddef.h>
#include <linux/stddef.h>
+#include <u-boot/crc.h>
#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
#include <i2c.h>
#endif
#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
#include <i2c.h>
#endif
@@
-132,9
+134,11
@@
static int env_eeprom_load(void)
gd->env_valid = ENV_REDUND;
} else {
/* both ok - check serial */
gd->env_valid = ENV_REDUND;
} else {
/* both ok - check serial */
- if (flags[0] == ACTIVE_FLAG && flags[1] == OBSOLETE_FLAG)
+ if (flags[0] == ENV_REDUND_ACTIVE &&
+ flags[1] == ENV_REDUND_OBSOLETE)
gd->env_valid = ENV_VALID;
gd->env_valid = ENV_VALID;
- else if (flags[0] == OBSOLETE_FLAG && flags[1] == ACTIVE_FLAG)
+ else if (flags[0] == ENV_REDUND_OBSOLETE &&
+ flags[1] == ENV_REDUND_ACTIVE)
gd->env_valid = ENV_REDUND;
else if (flags[0] == 0xFF && flags[1] == 0)
gd->env_valid = ENV_REDUND;
gd->env_valid = ENV_REDUND;
else if (flags[0] == 0xFF && flags[1] == 0)
gd->env_valid = ENV_REDUND;
@@
-194,7
+198,7
@@
static int env_eeprom_save(void)
unsigned int off = CONFIG_ENV_OFFSET;
#ifdef CONFIG_ENV_OFFSET_REDUND
unsigned int off_red = CONFIG_ENV_OFFSET_REDUND;
unsigned int off = CONFIG_ENV_OFFSET;
#ifdef CONFIG_ENV_OFFSET_REDUND
unsigned int off_red = CONFIG_ENV_OFFSET_REDUND;
- char flag_obsolete =
OBSOLETE_FLAG
;
+ char flag_obsolete =
ENV_REDUND_OBSOLETE
;
#endif
rc = env_export(&env_new);
#endif
rc = env_export(&env_new);
@@
-207,7
+211,7
@@
static int env_eeprom_save(void)
off_red = CONFIG_ENV_OFFSET;
}
off_red = CONFIG_ENV_OFFSET;
}
- env_new.flags =
ACTIVE_FLAG
;
+ env_new.flags =
ENV_REDUND_ACTIVE
;
#endif
rc = eeprom_bus_write(CONFIG_SYS_DEF_EEPROM_ADDR,
#endif
rc = eeprom_bus_write(CONFIG_SYS_DEF_EEPROM_ADDR,