configs: Resync with savedefconfig

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

diff --git a/env/ext4.c b/env/ext4.c
index 911e19c..9f65afb 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -19,6 +19,7 @@
  */
 
 #include <common.h>
+#include <part.h>
 
 #include <command.h>
 #include <env.h>
@@ -30,6 +31,9 @@
 #include <errno.h>
 #include <ext4fs.h>
 #include <mmc.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 __weak const char *env_ext4_get_intf(void)
 {
@@ -38,23 +42,32 @@ __weak const char *env_ext4_get_intf(void)
 
 __weak const char *env_ext4_get_dev_part(void)
 {
+#ifdef CONFIG_MMC
+       static char *part_str;
+
+       if (!part_str) {
+               part_str = CONFIG_ENV_EXT4_DEVICE_AND_PART;
+               if (!strcmp(CONFIG_ENV_EXT4_INTERFACE, "mmc") && part_str[0] == ':') {
+                       part_str = "0" CONFIG_ENV_EXT4_DEVICE_AND_PART;
+                       part_str[0] += mmc_get_env_dev();
+               }
+       }
+
+       return part_str;
+#else
        return (const char *)CONFIG_ENV_EXT4_DEVICE_AND_PART;
+#endif
 }
 
-static int env_ext4_save(void)
+static int env_ext4_save_buffer(env_t *env_new)
 {
-       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();
        const char *dev_and_part = env_ext4_get_dev_part();
 
-       err = env_export(&env_new);
-       if (err)
-               return err;
-
        part = blk_get_device_part_str(ifname, dev_and_part,
                                       &dev_desc, &info, 1);
        if (part < 0)
@@ -69,7 +82,7 @@ static int env_ext4_save(void)
                return 1;
        }
 
-       err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)&env_new,
+       err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)env_new,
                           sizeof(env_t), FILETYPE_REG);
        ext4fs_close();
 
@@ -79,7 +92,42 @@ static int env_ext4_save(void)
                return 1;
        }
 
+       return 0;
+}
+
+static int env_ext4_save(void)
+{
+       env_t env_new;
+       int err;
+
+       err = env_export(&env_new);
+       if (err)
+               return err;
+
+       err = env_ext4_save_buffer(&env_new);
+       if (err)
+               return err;
+
+       gd->env_valid = ENV_VALID;
        puts("done\n");
+
+       return 0;
+}
+
+static int env_ext4_erase(void)
+{
+       env_t env_new;
+       int err;
+
+       memset(&env_new, 0, sizeof(env_t));
+
+       err = env_ext4_save_buffer(&env_new);
+       if (err)
+               return err;
+
+       gd->env_valid = ENV_INVALID;
+       puts("done\n");
+
        return 0;
 }
 
@@ -87,7 +135,7 @@ 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;
@@ -123,7 +171,11 @@ static int env_ext4_load(void)
                goto err_env_relocate;
        }
 
-       return env_import(buf, 1);
+       err = env_import(buf, 1, H_EXTERNAL);
+       if (!err)
+               gd->env_valid = ENV_VALID;
+
+       return err;
 
 err_env_relocate:
        env_set_default(NULL, 0);
@@ -136,4 +188,5 @@ U_BOOT_ENV_LOCATION(ext4) = {
        ENV_NAME("EXT4")
        .load           = env_ext4_load,
        .save           = ENV_SAVE_PTR(env_ext4_save),
+       .erase          = ENV_ERASE_PTR(env_ext4_erase),
 };