X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fenv_fat.c;h=75616d4c5b5c8a00d8415c15a63776520435d8a5;hb=92ca476c3a27451e05a746798102a857ad80e46c;hp=aad0487c32805aea4ec94e488f498c842e18cef6;hpb=9f5f51540d0d6af03ff22f55b7afc3fda6a4120d;p=u-boot

diff --git a/common/env_fat.c b/common/env_fat.c
index aad0487c32..75616d4c5b 100644
--- a/common/env_fat.c
+++ b/common/env_fat.c
@@ -13,6 +13,7 @@
 #include <environment.h>
 #include <linux/stddef.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <search.h>
 #include <errno.h>
 #include <fat.h>
@@ -37,44 +38,31 @@ int env_init(void)
 int saveenv(void)
 {
 	env_t	env_new;
-	block_dev_desc_t *dev_desc = NULL;
-	int dev = FAT_ENV_DEVICE;
-	int part = FAT_ENV_PART;
+	struct blk_desc *dev_desc = NULL;
+	disk_partition_t info;
+	int dev, part;
 	int err;
+	loff_t size;
 
 	err = env_export(&env_new);
 	if (err)
 		return err;
 
-#ifdef CONFIG_MMC
-	if (strcmp(FAT_ENV_INTERFACE, "mmc") == 0) {
-		struct mmc *mmc = find_mmc_device(dev);
-
-		if (!mmc) {
-			printf("no mmc device at slot %x\n", dev);
-			return 1;
-		}
-
-		mmc->has_init = 0;
-		mmc_init(mmc);
-	}
-#endif /* CONFIG_MMC */
-
-	dev_desc = get_dev(FAT_ENV_INTERFACE, dev);
-	if (dev_desc == NULL) {
-		printf("Failed to find %s%d\n",
-			FAT_ENV_INTERFACE, dev);
+	part = blk_get_device_part_str(FAT_ENV_INTERFACE,
+					FAT_ENV_DEVICE_AND_PART,
+					&dev_desc, &info, 1);
+	if (part < 0)
 		return 1;
-	}
 
-	err = fat_register_device(dev_desc, part);
-	if (err) {
-		printf("Failed to register %s%d:%d\n",
-			FAT_ENV_INTERFACE, dev, part);
+	dev = dev_desc->devnum;
+	if (fat_set_blk_dev(dev_desc, &info) != 0) {
+		printf("\n** Unable to use %s %d:%d for saveenv **\n",
+		       FAT_ENV_INTERFACE, dev, part);
 		return 1;
 	}
 
-	err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, sizeof(env_t));
+	err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, 0, sizeof(env_t),
+			     &size);
 	if (err == -1) {
 		printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
 			FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
@@ -88,50 +76,35 @@ int saveenv(void)
 
 void env_relocate_spec(void)
 {
-	char buf[CONFIG_ENV_SIZE];
-	block_dev_desc_t *dev_desc = NULL;
-	int dev = FAT_ENV_DEVICE;
-	int part = FAT_ENV_PART;
+	ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
+	struct blk_desc *dev_desc = NULL;
+	disk_partition_t info;
+	int dev, part;
 	int err;
 
-#ifdef CONFIG_MMC
-	if (strcmp(FAT_ENV_INTERFACE, "mmc") == 0) {
-		struct mmc *mmc = find_mmc_device(dev);
-
-		if (!mmc) {
-			printf("no mmc device at slot %x\n", dev);
-			set_default_env(NULL);
-			return;
-		}
-
-		mmc->has_init = 0;
-		mmc_init(mmc);
-	}
-#endif /* CONFIG_MMC */
-
-	dev_desc = get_dev(FAT_ENV_INTERFACE, dev);
-	if (dev_desc == NULL) {
-		printf("Failed to find %s%d\n",
-			FAT_ENV_INTERFACE, dev);
-		set_default_env(NULL);
-		return;
+	part = blk_get_device_part_str(FAT_ENV_INTERFACE,
+					FAT_ENV_DEVICE_AND_PART,
+					&dev_desc, &info, 1);
+	if (part < 0)
+		goto err_env_relocate;
+
+	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",
+		       FAT_ENV_INTERFACE, dev, part);
+		goto err_env_relocate;
 	}
 
-	err = fat_register_device(dev_desc, part);
-	if (err) {
-		printf("Failed to register %s%d:%d\n",
-			FAT_ENV_INTERFACE, dev, part);
-		set_default_env(NULL);
-		return;
-	}
-
-	err = file_fat_read(FAT_ENV_FILE, (uchar *)&buf, CONFIG_ENV_SIZE);
+	err = file_fat_read(FAT_ENV_FILE, buf, CONFIG_ENV_SIZE);
 	if (err == -1) {
 		printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
 			FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
-		set_default_env(NULL);
-		return;
+		goto err_env_relocate;
 	}
 
 	env_import(buf, 1);
+	return;
+
+err_env_relocate:
+	set_default_env(NULL);
 }