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

[u-boot] / env / fat.c

diff --git a/env/fat.c b/env/fat.c
index 1ff3d9dc865fd397540936ccf2fe383e57995886..ec49c39053691a5d6638fc64af2e9caf910ca5ea 100644 (file)
--- a/env/fat.c
+++ b/env/fat.c
@@ -31,10 +31,6 @@
 # endif
 #endif
 
-char *env_name_spec = "FAT";
-
-env_t *env_ptr;
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CMD_SAVEENV
@@ -78,7 +74,7 @@ static int env_fat_save(void)
 #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;
@@ -107,15 +103,18 @@ static void env_fat_load(void)
        }
 
        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