Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh

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

diff --git a/env/fat.c b/env/fat.c
index befbc1e..63aced9 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -1,23 +1,24 @@
+// 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 <linux/stddef.h>
+#include <env.h>
+#include <env_internal.h>
+#include <part.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <search.h>
 #include <errno.h>
 #include <fat.h>
 #include <mmc.h>
+#include <asm/cache.h>
+#include <linux/stddef.h>
 
 #ifdef CONFIG_SPL_BUILD
 /* TODO(sjg@chromium.org): Figure out why this is needed */
@@ -26,17 +27,41 @@
 # endif
 #else
 # define LOADENV
-# if defined(CONFIG_CMD_SAVEENV)
-#  define CMD_SAVEENV
-# endif
 #endif
 
-#ifdef CMD_SAVEENV
+__weak int mmc_get_env_dev(void)
+{
+#ifdef CONFIG_SYS_MMC_ENV_DEV
+       return CONFIG_SYS_MMC_ENV_DEV;
+#else
+       return 0;
+#endif
+}
+
+static char *env_fat_device_and_part(void)
+{
+#ifdef CONFIG_MMC
+       static char *part_str;
+
+       if (!part_str) {
+               part_str = CONFIG_ENV_FAT_DEVICE_AND_PART;
+               if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc") && part_str[0] == ':') {
+                       part_str = "0" CONFIG_ENV_FAT_DEVICE_AND_PART;
+                       part_str[0] += mmc_get_env_dev();
+               }
+       }
+
+       return part_str;
+#else
+       return CONFIG_ENV_FAT_DEVICE_AND_PART;
+#endif
+}
+
 static int env_fat_save(void)
 {
        env_t __aligned(ARCH_DMA_MINALIGN) env_new;
        struct blk_desc *dev_desc = NULL;
-       disk_partition_t info;
+       struct disk_partition info;
        int dev, part;
        int err;
        loff_t size;
@@ -46,7 +71,7 @@ static int env_fat_save(void)
                return err;
 
        part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
-                                       CONFIG_ENV_FAT_DEVICE_AND_PART,
+                                       env_fat_device_and_part(),
                                        &dev_desc, &info, 1);
        if (part < 0)
                return 1;
@@ -76,14 +101,13 @@ static int env_fat_save(void)
 
        return 0;
 }
-#endif /* CMD_SAVEENV */
 
 #ifdef LOADENV
 static int env_fat_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;
 
@@ -93,7 +117,7 @@ static int env_fat_load(void)
 #endif
 
        part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
-                                       CONFIG_ENV_FAT_DEVICE_AND_PART,
+                                       env_fat_device_and_part(),
                                        &dev_desc, &info, 1);
        if (part < 0)
                goto err_env_relocate;
@@ -123,7 +147,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 +159,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),
 };