Merge git://git.denx.de/u-boot-socfpga

[people/ms/u-boot.git] / env / fat.c

diff --git a/env/fat.c b/env/fat.c
index b959013a88feb20feefffc11e1050a706f72bbb2..158a9a34357bb8eb791ac3372c977d9a0d2b698e 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -31,21 +31,8 @@
 # endif
 #endif
 
-char *env_name_spec = "FAT";
-
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
-static int env_fat_init(void)
-{
-       /* use default */
-       gd->env_addr = (ulong)&default_environment[0];
-       gd->env_valid = ENV_VALID;
-
-       return 0;
-}
-
 #ifdef CMD_SAVEENV
 static int env_fat_save(void)
 {
@@ -68,7 +55,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;
        }
@@ -76,18 +67,21 @@ 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 void env_fat_load(void)
+static int env_fat_load(void)
 {
        ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
        struct blk_desc *dev_desc = NULL;
@@ -103,33 +97,43 @@ static void 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;
+       return 0;
 
 err_env_relocate:
        set_default_env(NULL);
+
+       return -EIO;
 }
 #endif /* LOADENV */
 
 U_BOOT_ENV_LOCATION(fat) = {
        .location       = ENVL_FAT,
+       ENV_NAME("FAT")
 #ifdef LOADENV
        .load           = env_fat_load,
 #endif
 #ifdef CMD_SAVEENV
        .save           = env_save_ptr(env_fat_save),
 #endif
-       .init           = env_fat_init,
 };