env: Drop saveenv() in favour of env_save()

Use the env_save() function directly now that there is only one
implementation of saveenv().

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Wolfgang Denk <wd@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2017-08-03 12:22:08 -06:00 committed by Tom Rini
parent 310fb14b26
commit 01510091de
9 changed files with 20 additions and 15 deletions

View File

@ -10,6 +10,7 @@
#include <common.h>
#include <ahci.h>
#include <environment.h>
#include <spl.h>
#include <asm/omap_common.h>
#include <asm/arch/omap.h>
@ -241,7 +242,7 @@ int fb_set_reboot_flag(void)
{
printf("Setting reboot to fastboot flag ...\n");
setenv("dofastboot", "1");
saveenv();
env_save();
return 0;
}
#endif

View File

@ -5,6 +5,7 @@
*/
#include <common.h>
#include <dwc3-uboot.h>
#include <environment.h>
#include <mmc.h>
#include <u-boot/md5.h>
#include <usb.h>
@ -70,7 +71,7 @@ static void assign_serial(void)
setenv("serial#", serial);
#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
saveenv();
env_save();
#endif
}
@ -88,7 +89,7 @@ static void assign_hardware_id(void)
setenv("hardware_id", hardware_id);
#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
saveenv();
env_save();
#endif
}

View File

@ -15,6 +15,7 @@
#include <command.h>
#include <common.h>
#include <dm.h>
#include <environment.h>
#include <asm/io.h>
#include <asm/arch/at91sam9260_matrix.h>
#include <asm/arch/at91sam9_smc.h>
@ -405,7 +406,7 @@ static int upgrade_failure_fallback(void)
setenv("bootargs", '\0');
setenv("upgrade_available", '\0');
setenv("boot_retries", '\0');
saveenv();
env_save();
return 0;
}
@ -424,7 +425,7 @@ static int do_upgrade_available(cmd_tbl_t *cmdtp, int flag, int argc,
boot_retry++;
sprintf(boot_buf, "%lx", boot_retry);
setenv("boot_retries", boot_buf);
saveenv();
env_save();
/*
* Here the boot_retries count is checked, and if the

View File

@ -9,6 +9,7 @@
#include <common.h>
#include <dm.h>
#include <environment.h>
#include <asm/arch/clock.h>
#include <asm/arch/crm_regs.h>
#include <asm/arch/mxc_hdmi.h>
@ -818,7 +819,7 @@ int board_late_init(void)
setenv("fdt_file", FDT_FILE_V1_0);
printf("patching fdt_file to " FDT_FILE_V1_0 "\n");
#ifndef CONFIG_ENV_IS_NOWHERE
saveenv();
env_save();
#endif
}
}

View File

@ -710,7 +710,7 @@ static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc,
printf("Saving Environment to %s...\n", env->name);
return saveenv() ? 1 : 0;
return env_save() ? 1 : 0;
}
U_BOOT_CMD(

View File

@ -6,6 +6,7 @@
*/
#include <common.h>
#include <environment.h>
void bootcount_store(ulong a)
{
@ -13,7 +14,7 @@ void bootcount_store(ulong a)
if (upgrade_available) {
setenv_ulong("bootcount", a);
saveenv();
env_save();
}
}

6
env/env.c vendored
View File

@ -149,9 +149,3 @@ int env_init(void)
return 0;
}
int saveenv(void)
{
return env_save();
}

View File

@ -336,7 +336,6 @@ ulong getenv_hex(const char *varname, ulong default_val);
* Return -1 if variable does not exist (default to true)
*/
int getenv_yesno(const char *var);
int saveenv (void);
int setenv (const char *, const char *);
int setenv_ulong(const char *varname, ulong value);
int setenv_hex(const char *varname, ulong value);

View File

@ -325,6 +325,13 @@ int env_get_char(int index);
*/
int env_load(void);
/**
* env_save() - Save the environment to storage
*
* @return 0 if OK, -ve on error
*/
int env_save(void);
#endif /* DO_DEPS_ONLY */
#endif /* _ENVIRONMENT_H_ */