summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2020-02-19 09:47:42 +0000
committerTom Rini <trini@konsulko.com>2020-04-24 10:10:00 -0400
commit1df96a7e7679c691e43e53206418302aff236a27 (patch)
tree99c7b8c06a6e8419435780031eecefd5c4d0a0e6
parent3908bc93443be458abe28b9c3797ad912612631a (diff)
env/ext4.c: remove CONFIG_CMD_SAVEENV ifdef
Removing this ifdef/endif pair yields a "defined but unused warning" for CONFIG_CMD_SAVEENV=n, but that vanishes if we use the ENV_SAVE_PTR macro instead. This gives slightly better compile testing, and moreover, it's possible to have CONFIG_CMD_SAVEENV=n CONFIG_SPL_SAVEENV=y SPL_ENV_IS_IN_EXT4=y in which case env_ext4_save would erroneously not be compiled in. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-rw-r--r--env/ext4.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/env/ext4.c b/env/ext4.c
index 1f6b1b5bd8..911e19c6d3 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -41,7 +41,6 @@ __weak const char *env_ext4_get_dev_part(void)
return (const char *)CONFIG_ENV_EXT4_DEVICE_AND_PART;
}
-#ifdef CONFIG_CMD_SAVEENV
static int env_ext4_save(void)
{
env_t env_new;
@@ -83,7 +82,6 @@ static int env_ext4_save(void)
puts("done\n");
return 0;
}
-#endif /* CONFIG_CMD_SAVEENV */
static int env_ext4_load(void)
{
@@ -137,5 +135,5 @@ U_BOOT_ENV_LOCATION(ext4) = {
.location = ENVL_EXT4,
ENV_NAME("EXT4")
.load = env_ext4_load,
- .save = env_save_ptr(env_ext4_save),
+ .save = ENV_SAVE_PTR(env_ext4_save),
};