aboutsummaryrefslogtreecommitdiff
path: root/env/sf.c
diff options
context:
space:
mode:
authorRasmus Villemoes2020-02-19 09:47:43 +0000
committerTom Rini2020-04-24 10:10:00 -0400
commit9e3c94d117bb3a196ad6e03babb8bc30da4b3ff0 (patch)
treec74cefca16cde2a5e251d0ad7b20367c101d22a3 /env/sf.c
parent1df96a7e7679c691e43e53206418302aff236a27 (diff)
env/sf.c: drop private CMD_SAVEENV logic
Deciding whether to compile the env_sf_save() function based solely on CONFIG_SPL_BUILD is wrong: For U-Boot proper, it leads to a build warning in case CONFIG_CMD_SAVEENV=n (because the env_save_ptr() macro causes the function to indeed not be referenced anywhere). And for SPL, when one selects CONFIG_SPL_SAVEENV, one obviously expects to actually be able to save the environment. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Diffstat (limited to 'env/sf.c')
-rw-r--r--env/sf.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/env/sf.c b/env/sf.c
index 5ef40552194..22b70ad3197 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -21,16 +21,12 @@
#include <u-boot/crc.h>
#ifndef CONFIG_SPL_BUILD
-#define CMD_SAVEENV
#define INITENV
#endif
#ifdef CONFIG_ENV_OFFSET_REDUND
-#ifdef CMD_SAVEENV
static ulong env_offset = CONFIG_ENV_OFFSET;
static ulong env_new_offset = CONFIG_ENV_OFFSET_REDUND;
-#endif
-
#endif /* CONFIG_ENV_OFFSET_REDUND */
DECLARE_GLOBAL_DATA_PTR;
@@ -69,7 +65,6 @@ static int setup_flash_device(void)
}
#if defined(CONFIG_ENV_OFFSET_REDUND)
-#ifdef CMD_SAVEENV
static int env_sf_save(void)
{
env_t env_new;
@@ -148,7 +143,6 @@ static int env_sf_save(void)
return ret;
}
-#endif /* CMD_SAVEENV */
static int env_sf_load(void)
{
@@ -187,7 +181,6 @@ out:
return ret;
}
#else
-#ifdef CMD_SAVEENV
static int env_sf_save(void)
{
u32 saved_size, saved_offset, sector;
@@ -247,7 +240,6 @@ static int env_sf_save(void)
return ret;
}
-#endif /* CMD_SAVEENV */
static int env_sf_load(void)
{
@@ -313,9 +305,7 @@ U_BOOT_ENV_LOCATION(sf) = {
.location = ENVL_SPI_FLASH,
ENV_NAME("SPI Flash")
.load = env_sf_load,
-#ifdef CMD_SAVEENV
- .save = env_save_ptr(env_sf_save),
-#endif
+ .save = ENV_SAVE_PTR(env_sf_save),
#if defined(INITENV) && (CONFIG_ENV_ADDR != 0x0)
.init = env_sf_init,
#endif