DECLARE_GLOBAL_DATA_PTR;
-env_t *env_ptr;
-
-char *env_name_spec = "EEPROM";
-
static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
uchar *buffer, unsigned cnt)
{
return rcode;
}
-static uchar env_eeprom_get_char(int index)
+/** Call this function from overridden env_get_char_spec() if you need
+ * this functionality.
+ */
+int env_eeprom_get_char(int index)
{
uchar c;
unsigned int off = CONFIG_ENV_OFFSET;
return c;
}
-static void env_eeprom_load(void)
+static int env_eeprom_load(void)
{
char buf_env[CONFIG_ENV_SIZE];
unsigned int off = CONFIG_ENV_OFFSET;
if (!crc_ok[0] && !crc_ok[1]) {
gd->env_addr = 0;
- gd->env_valid = 0;
+ gd->env_valid = ENV_INVALID;
} else if (crc_ok[0] && !crc_ok[1]) {
gd->env_valid = ENV_VALID;
} else if (!crc_ok[0] && crc_ok[1]) {
}
if (crc == new) {
- gd->env_valid = ENV_VALID;
+ gd->env_valid = ENV_VALID;
} else {
- gd->env_valid = 0;
+ gd->env_valid = ENV_INVALID;
}
#endif /* CONFIG_ENV_OFFSET_REDUND */
eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR,
off, (uchar *)buf_env, CONFIG_ENV_SIZE);
- env_import(buf_env, 1);
+ return env_import(buf_env, 1);
}
static int env_eeprom_save(void)
char flag_obsolete = OBSOLETE_FLAG;
#endif
- BUG_ON(env_ptr != NULL);
-
rc = env_export(&env_new);
if (rc)
return rc;
return rc;
}
-/*
- * Initialize Environment use
- *
- * We are still running from ROM, so data use is limited.
- * Use a (moderately small) buffer on the stack
- */
-static int env_eeprom_init(void)
-{
- gd->env_addr = (ulong)&default_environment[0];
- gd->env_valid = ENV_VALID;
- return 0;
-}
-
U_BOOT_ENV_LOCATION(eeprom) = {
.location = ENVL_EEPROM,
- .get_char = env_eeprom_get_char,
+ ENV_NAME("EEPROM")
.load = env_eeprom_load,
.save = env_save_ptr(env_eeprom_save),
- .init = env_eeprom_init,
};