Skip to contentSkip to conversation

env_fat: use get_device_and_partition() during env save and load

PATCH Superseded Josh Wu 3 participants 7 messages Jun 23, 2014 – Jun 24, 2014 Arm/Microchip (AT91) SoC support

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Josh Wu

author
#0 lore raw

PATCH v2 1/2 env_fat: use get_device_and_partition() during env save and load

From: "Wu, Josh" <[email protected]>

Use get_device_and_partition() is better since:
1. It will call the device initialize function internally. So we can remove the mmc intialization code to save many lines.
2. It is used by fatls/fatload/fatwrite. So saveenv & load env should use it too.
3. It can parse the "D:P", "D", "D:", "D:auto" string to get correct device and partition information by run-time.

Also we remove the FAT_ENV_DEVICE and FAT_ENV_PART. We use a string:
FAT_ENV_DEVICE_AND_PART.
For at91sam9m10g45ek, it is "0". That means use device 0 and if:
a)device 0 has no partition table, use the whole device as a FAT file system.
b)device 0 has partittion table, use the partition #1.

Refer to the commit: 10a37fd7a4 for details of device & partition string.

Signed-off-by Josh Wu <[email protected]>
Reviewed-by Stephen Warren <[email protected]>

---
v1 -> v2: no change in this patch. Add one more patch in this patch series to
update the README file.

 common/env_fat.c                   |   86 ++++++++++++------------------------
 include/configs/at91sam9m10g45ek.h |    8 +++-
 2 files changed, 34 insertions(+), 60 deletions(-)
common/env_fat.c +28 -58
index aad0487..328c09d 100644
@@ -38,39 +38,24 @@ int saveenv(void)
 {
 	env_t	env_new;
 	block_dev_desc_t *dev_desc = NULL;
-	int dev = FAT_ENV_DEVICE;
-	int part = FAT_ENV_PART;
+	disk_partition_t info;
+	int dev, part;
 	int err;
 
 	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 = get_device_and_partition(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->dev;
+	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;
 	}
 

@@ -90,48 +75,33 @@ 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;
+	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;
-	}
-
-	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;
+	part = get_device_and_partition(FAT_ENV_INTERFACE,
+					FAT_ENV_DEVICE_AND_PART,
+					&dev_desc, &info, 1);
+	if (part < 0)
+		goto err_env_relocate;
+
+	dev = dev_desc->dev;
+	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 = file_fat_read(FAT_ENV_FILE, (uchar *)&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);
 }
include/configs/at91sam9m10g45ek.h +6 -2
index 341b21d..db5d5ea 100644
@@ -167,8 +167,12 @@
 #elif CONFIG_SYS_USE_MMC
 /* bootstrap + u-boot + env + linux in mmc */
 #define FAT_ENV_INTERFACE	"mmc"
-#define FAT_ENV_DEVICE		0
-#define FAT_ENV_PART		1
+/*
+ * We don't specify the part number, if device 0 has partition table, it means
+ * the first partition; it no partition table, then take whole device as a
+ * FAT file system.
+ */
+#define FAT_ENV_DEVICE_AND_PART	"0"
 #define FAT_ENV_FILE		"uboot.env"
 #define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_FAT_WRITE
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 2/2 README: document the CONFIG_ENV_IS_IN_FAT option

Signed-off-by Josh Wu <[email protected]>
---
 README |   31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
README +31 -0
index 7129df8..0c9fda3 100644
@@ -4133,6 +4133,37 @@ but it can not erase, write this NOR flash by SRIO or PCIE interface.
 	  You will probably want to define these to avoid a really noisy system
 	  when storing the env in UBI.
 
+- CONFIG_ENV_IS_IN_FAT:
+       Define this if you want to use the FAT file system for the environment.
+
+       - FAT_ENV_INTERFACE:
+
+         Define this to a string that is the name of the block device.
+
+       - FAT_ENV_DEV_AND_PART:
+
+         Define this to a string to specify the partition of the device. It can
+         be as following:
+
+           "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1)
+               - "D:P": device D partition P. Error occurs if device D has no
+                        partition table.
+               - "D:0": device D.
+               - "D" or "D:": device D partition 1 if device D has partition
+                              table, or the whole device D if has no partition
+                              table.
+               - "D:auto": first partition in device D with bootable flag set.
+                           If none, first valid paratition in device D. If no
+                           partition table then means device D.
+
+       - FAT_ENV_FILE:
+
+         It's a string of the FAT file name. This file use to store the
+         envrionment.
+
+       - CONFIG_FAT_WRITE:
+         This should be defined. Otherwise it cannot save the envrionment file.
+
 - CONFIG_ENV_IS_IN_MMC:
 
 	Define this if you have an MMC device which you want to use for the
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH v2 2/2 README: document the CONFIG_ENV_IS_IN_FAT option

Quoted 4 lines · Stephen Warren
Quoted 1 line · Josh Wu
Signed-off-by Josh Wu <[email protected]>

A quick description might be nice. Otherwise,

Josh,

Any chance you want to patch the lack of CONFIG_ENV_IS_IN_SPI_FLASH documentation while you are in the area? :-)

jdl

author
#4 lore raw

PATCH v2 2/2 README: document the CONFIG_ENV_IS_IN_FAT option

Hi, Jon

Quoted 8 lines · Jon Loeliger
Quoted 3 lines · Stephen Warren
Quoted 1 line · Josh Wu
Signed-off-by Josh Wu <[email protected]>

A quick description might be nice. Otherwise,

Josh,

Any chance you want to patch the lack of CONFIG_ENV_IS_IN_SPI_FLASH documentation while you are in the area? :-)

I think it's no problem ;-)
I will do a patch for SPI_FLASH.

Quoted 2 lines

jdl

Best Regards,
Josh Wu

#5 lore raw

PATCH v2 2/2 README: document the CONFIG_ENV_IS_IN_FAT option

Quoted 10 lines · Josh Wu
Quoted 4 lines

Josh,

Any chance you want to patch the lack of CONFIG_ENV_IS_IN_SPI_FLASH documentation while you are in the area? :-)

I think it's no problem ;-)
I will do a patch for SPI_FLASH.

Best Regards,
Josh Wu

Awesome!

Thanks,
jdl