common: Drop bootstage.h from common header

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

diff --git a/env/fat.c b/env/fat.c
index ec49c39053691a5d6638fc64af2e9caf910ca5ea..35a1955e634330e6b5bb5160b809b5bec20f4a66 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,19 +27,13 @@
 # endif
 #else
 # define LOADENV
-# if defined(CONFIG_CMD_SAVEENV)
-#  define CMD_SAVEENV
-# endif
 #endif
 
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CMD_SAVEENV
 static int env_fat_save(void)
 {
-       env_t   env_new;
+       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;
@@ -55,7 +50,11 @@ static int env_fat_save(void)
 
        dev = dev_desc->devnum;
        if (fat_set_blk_dev(dev_desc, &info) != 0) {
-               printf("\n** Unable to use %s %d:%d for saveenv **\n",
+               /*
+                * This printf is embedded in the messages from env_save that
+                * will calling it. The missing \n is intentional.
+                */
+               printf("Unable to use %s %d:%d... ",
                       CONFIG_ENV_FAT_INTERFACE, dev, part);
                return 1;
        }
@@ -63,25 +62,32 @@ static int env_fat_save(void)
        err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t),
                             &size);
        if (err == -1) {
-               printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
+               /*
+                * This printf is embedded in the messages from env_save that
+                * will calling it. The missing \n is intentional.
+                */
+               printf("Unable to write \"%s\" from %s%d:%d... ",
                        CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
                return 1;
        }
 
-       puts("done\n");
        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;
 
+#ifdef CONFIG_MMC
+       if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc"))
+               mmc_initialize(NULL);
+#endif
+
        part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE,
                                        CONFIG_ENV_FAT_DEVICE_AND_PART,
                                        &dev_desc, &info, 1);
@@ -90,23 +96,30 @@ static int env_fat_load(void)
 
        dev = dev_desc->devnum;
        if (fat_set_blk_dev(dev_desc, &info) != 0) {
-               printf("\n** Unable to use %s %d:%d for loading the env **\n",
+               /*
+                * This printf is embedded in the messages from env_save that
+                * will calling it. The missing \n is intentional.
+                */
+               printf("Unable to use %s %d:%d... ",
                       CONFIG_ENV_FAT_INTERFACE, dev, part);
                goto err_env_relocate;
        }
 
        err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE);
        if (err == -1) {
-               printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
+               /*
+                * This printf is embedded in the messages from env_save that
+                * will calling it. The missing \n is intentional.
+                */
+               printf("Unable to read \"%s\" from %s%d:%d... ",
                        CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part);
                goto err_env_relocate;
        }
 
-       env_import(buf, 1);
-       return 0;
+       return env_import(buf, 1);
 
 err_env_relocate:
-       set_default_env(NULL);
+       env_set_default(NULL, 0);
 
        return -EIO;
 }
@@ -118,7 +131,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),
 };