driver: net: fm: change init_phy() param

[platform/kernel/u-boot.git] / env / ext4.c

diff --git a/env/ext4.c b/env/ext4.c
index 9947381..911e19c 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -21,7 +21,8 @@
 #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>
@@ -40,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;
@@ -82,7 +82,6 @@ static int env_ext4_save(void)
        puts("done\n");
        return 0;
 }
-#endif /* CONFIG_CMD_SAVEENV */
 
 static int env_ext4_load(void)
 {
@@ -127,7 +126,7 @@ static int env_ext4_load(void)
        return env_import(buf, 1);
 
 err_env_relocate:
-       set_default_env(NULL, 0);
+       env_set_default(NULL, 0);
 
        return -EIO;
 }
@@ -136,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),
 };