This is a strange name for a function that loads the environment. There is
now only one implementation of this function, so use the new env_load()
function directly instead.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
debug("%s\n", __func__);
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
debug("%s\n", __func__);
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
debug("boot_os=%s\n", getenv("boot_os"));
if (getenv_yesno("boot_os") == 1)
ret = 0;
debug("boot_os=%s\n", getenv("boot_os"));
if (getenv_yesno("boot_os") == 1)
ret = 0;
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
#ifdef CONFIG_SPL_ENV_SUPPORT
env_init();
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
if (getenv_yesno("boot_os") != 1)
return 1;
#endif
set_default_env("!bad CRC");
#endif
} else {
set_default_env("!bad CRC");
#endif
} else {
-void env_relocate_spec(void)
-{
- env_load();
-}
-
int saveenv(void)
{
return env_save();
int saveenv(void)
{
return env_save();
extern const unsigned char default_environment[];
extern env_t *env_ptr;
extern const unsigned char default_environment[];
extern env_t *env_ptr;
-extern void env_relocate_spec(void);
-
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
extern void env_reloc(void);
#endif
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
extern void env_reloc(void);
#endif
*/
int env_get_char(int index);
*/
int env_get_char(int index);
+/**
+ * env_load() - Load the environment from storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_load(void);
+
#endif /* DO_DEPS_ONLY */
#endif /* _ENVIRONMENT_H_ */
#endif /* DO_DEPS_ONLY */
#endif /* _ENVIRONMENT_H_ */