env/sf.c: drop private CMD_SAVEENV logic

[oweals/u-boot.git] / env / fat.c

diff --git a/env/fat.c b/env/fat.c
index befbc1efdd31c33393775810e5daa21124465111..cf2e5e2b26e90b1f05bcf70a98c7d70cdaff6edf 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -1,16 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (c) Copyright 2011 by Tigris Elektronik GmbH
  *
  * Author:
  *  Maximilian Schwerin <mvs@tigris.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 
 #include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <memalign.h>
@@ -26,12 +26,8 @@
 # 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)
@@ -123,7 +118,7 @@ static int env_fat_load(void)
        return env_import(buf, 1);
 
 err_env_relocate:
-       set_default_env(NULL);
+       env_set_default(NULL, 0);
 
        return -EIO;
 }
@@ -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),
 };