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 ---
Changes in v5: None Changes in v4: - Add changes for edison also
Changes in v3: None Changes in v2: None
arch/arm/mach-omap2/boot-common.c | 3 ++- board/intel/edison/edison.c | 5 +++-- board/siemens/taurus/taurus.c | 5 +++-- board/toradex/apalis_imx6/apalis_imx6.c | 3 ++- cmd/nvedit.c | 2 +- drivers/bootcount/bootcount_env.c | 3 ++- env/env.c | 6 ------ include/common.h | 1 - include/environment.h | 7 +++++++ 9 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 700e6c2f79..2bcc8e9f97 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -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 diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c index a1a7d4d7c8..80f9b544b0 100644 --- a/board/intel/edison/edison.c +++ b/board/intel/edison/edison.c @@ -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 }
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 4aa8d64869..3b742ebc22 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -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 diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 8e5613cb12..e41547bbee 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -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 } } diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 75df997592..4431ef66d8 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -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( diff --git a/drivers/bootcount/bootcount_env.c b/drivers/bootcount/bootcount_env.c index 2d6e8db126..7f22dd0748 100644 --- a/drivers/bootcount/bootcount_env.c +++ b/drivers/bootcount/bootcount_env.c @@ -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(); } }
diff --git a/env/env.c b/env/env.c index 85d95e5747..2b8b9611cf 100644 --- a/env/env.c +++ b/env/env.c @@ -149,9 +149,3 @@ int env_init(void)
return 0; } - -int saveenv(void) -{ - return env_save(); -} - diff --git a/include/common.h b/include/common.h index 751665f8a4..f0fc02cd3b 100644 --- a/include/common.h +++ b/include/common.h @@ -335,7 +335,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); diff --git a/include/environment.h b/include/environment.h index b4f93663da..a055e3fa89 100644 --- a/include/environment.h +++ b/include/environment.h @@ -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_ */