env/fat.c: remove private CMD_SAVEENV logic
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Wed, 19 Feb 2020 09:47:41 +0000 (09:47 +0000)
committerTom Rini <trini@konsulko.com>
Fri, 24 Apr 2020 14:10:00 +0000 (10:10 -0400)
Always compile the env_fat_save() function, and let
CONFIG_IS_ENABLED(SAVEENV) (via the ENV_SAVE_PTR macro) decide whether
it actually ends up being compiled in.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
env/fat.c

index 1836556f361d012e0bcd5ba54323475fe181e8a3..cf2e5e2b26e90b1f05bcf70a98c7d70cdaff6edf 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
 # endif
 #else
 # define LOADENV
-# if defined(CONFIG_CMD_SAVEENV)
-#  define CMD_SAVEENV
-# endif
 #endif
 
-#ifdef CMD_SAVEENV
 static int env_fat_save(void)
 {
        env_t __aligned(ARCH_DMA_MINALIGN) env_new;
@@ -76,7 +72,6 @@ static int env_fat_save(void)
 
        return 0;
 }
-#endif /* CMD_SAVEENV */
 
 #ifdef LOADENV
 static int env_fat_load(void)
@@ -135,7 +130,5 @@ U_BOOT_ENV_LOCATION(fat) = {
 #ifdef LOADENV
        .load           = env_fat_load,
 #endif
-#ifdef CMD_SAVEENV
-       .save           = env_save_ptr(env_fat_save),
-#endif
+       .save           = ENV_SAVE_PTR(env_fat_save),
 };