colibri_imx6: fix video stdout in default environment

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

diff --git a/env/ext4.c b/env/ext4.c
index 9947381bfdb5858ef393252304f6d1c429d9674e..8e90bb71b75681a14e3240bd3508576ef3863e32 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -19,9 +19,11 @@
  */
 
 #include <common.h>
+#include <part.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,12 +42,11 @@ __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;
        struct blk_desc *dev_desc = NULL;
-       disk_partition_t info;
+       struct disk_partition info;
        int dev, part;
        int err;
        const char *ifname = env_ext4_get_intf();
@@ -82,13 +83,12 @@ static int env_ext4_save(void)
        puts("done\n");
        return 0;
 }
-#endif /* CONFIG_CMD_SAVEENV */
 
 static int env_ext4_load(void)
 {
        ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
        struct blk_desc *dev_desc = NULL;
-       disk_partition_t info;
+       struct disk_partition info;
        int dev, part;
        int err;
        loff_t off;
@@ -127,7 +127,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 +136,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),
 };