ARM: at91: save mmc environment in a FAT file instead of some sectors

PATCH Superseded Josh Wu 2 participants 10 messages Jan 19, 2015 Arm/Microchip (AT91) SoC support

Share & tools

Josh Wu

author

2015-01-19 07:06 UTC #0 lore raw

v2 cover ARM: at91: save mmc environment in a FAT file instead of some sectors

I sent these patches days ago with other patches which refactor SAMA5 common configuration files, see URL:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/203128/focus=203182
Since the patches which refactor SAMA5 common configuration files is rejected. So this time I only send the patches which only convert the mmc environment to FAT file.

Josh Wu (3):
ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC
card
ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card
ARM: at91: at91sam9x5: save environment to a FAT file in MMC card

 include/configs/at91sam9x5ek.h     | 11 ++++++-----
 include/configs/sama5d3_xplained.h | 10 ++++++----
 include/configs/sama5d3xek.h       | 10 ++++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

Signature · 1 line

1.9.1

Josh Wu

author

2015-01-19 07:06 UTC #1 lore raw

PATCH v2 1/3 ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card

This patch will save U-Boot environment as a file: uboot.env, in FAT partition instead of saving it in raw sector of MMC card.

This make us easier to manage the environment file.

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

---

 include/configs/sama5d3_xplained.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/sama5d3_xplained.h +6 -4

index d5588b1..a697035 100644
@@ -169,13 +169,15 @@
 				"bootz 0x22000000 - 0x21000000"
 #elif CONFIG_SYS_USE_MMC
 /* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET	0x2000
-#define CONFIG_ENV_SIZE		0x1000
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE
+#define FAT_ENV_INTERFACE	"mmc"
+#define FAT_ENV_FILE		"uboot.env"
+#define FAT_ENV_DEVICE_AND_PART	"0"
+#define CONFIG_ENV_SIZE		0x4000
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d3_xplained.dtb; " \
 				"fatload mmc 0:1 0x22000000 zImage; " \
 				"bootz 0x22000000 - 0x21000000"
-#define CONFIG_SYS_MMC_ENV_DEV	0
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #endif

Signature · 1 line

1.9.1

Bo Shen

2015-01-19 08:16 UTC #2 lore raw

PATCH v2 1/3 ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card

Hi Josh,

Quoted 6 lines · Josh Wu

This patch will save U-Boot environment as a file: uboot.env, in FAT partition instead of saving it in raw sector of MMC card.
This make us easier to manage the environment file.
Signed-off-by Josh Wu <[email protected]>

After you remove the duplicated definition.

Acked-by Bo Shen <[email protected]>

Quoted 10 lines

---

  include/configs/sama5d3_xplained.h | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/sama5d3_xplained.h +0 -0

index d5588b1..a697035 100644

include/configs/sama5d3_xplained.h line 173

Quoted 8 lines

include/configs/sama5d3_xplained.h +2 -3

@@ -169,13 +169,15 @@
  				"bootz 0x22000000 - 0x21000000"
  #elif CONFIG_SYS_USE_MMC
  /* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET	0x2000
-#define CONFIG_ENV_SIZE		0x1000
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE

This has been defined in
--->8---
#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) #define CONFIG_CMD_FAT
#define CONFIG_FAT_WRITE
---<8---

include/configs/sama5d3_xplained.h line 183

Quoted 12 lines

include/configs/sama5d3_xplained.h +4 -1

+#define FAT_ENV_INTERFACE	"mmc"
+#define FAT_ENV_FILE		"uboot.env"
+#define FAT_ENV_DEVICE_AND_PART	"0"
+#define CONFIG_ENV_SIZE		0x4000
  #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d3_xplained.dtb; " \
  				"fatload mmc 0:1 0x22000000 zImage; " \
  				"bootz 0x22000000 - 0x21000000"
-#define CONFIG_SYS_MMC_ENV_DEV	0
  #else
  #define CONFIG_ENV_IS_NOWHERE
  #endif

Best Regards,
Bo Shen

Josh Wu

author

2015-01-19 08:55 UTC #3 lore raw

PATCH v2 1/3 ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card

Quoted 7 lines · Bo Shen

Hi Josh,
Quoted 4 lines · Josh Wu
This patch will save U-Boot environment as a file: uboot.env, in FAT partition
instead of saving it in raw sector of MMC card.

Quoted 7 lines

Quoted 3 lines
This make us easier to manage the environment file.
Signed-off-by Josh Wu <[email protected]>
After you remove the duplicated definition.
Acked-by Bo Shen <[email protected]>

Thanks.

Quoted 19 lines

---

  include/configs/sama5d3_xplained.h | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/sama5d3_xplained.h +1 -3

index d5588b1..a697035 100644
@@ -169,13 +169,15 @@
                  "bootz 0x22000000 - 0x21000000"
  #elif CONFIG_SYS_USE_MMC
  /* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET    0x2000
-#define CONFIG_ENV_SIZE        0x1000
+#define CONFIG_ENV_IS_IN_FAT

Quoted 8 lines

include/configs/sama5d3_xplained.h line 173
Quoted 1 line
include/configs/sama5d3_xplained.h +1 -0
+#define CONFIG_FAT_WRITE
This has been defined in
--->8---
#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) #define CONFIG_CMD_FAT
#define CONFIG_FAT_WRITE
---<8---

Okay, you are right. Will do.

Best Regards,
Josh Wu

Quoted 17 lines

Quoted 12 lines

include/configs/sama5d3_xplained.h +4 -1

+#define FAT_ENV_INTERFACE    "mmc"
+#define FAT_ENV_FILE        "uboot.env"
+#define FAT_ENV_DEVICE_AND_PART    "0"
+#define CONFIG_ENV_SIZE        0x4000
  #define CONFIG_BOOTCOMMAND    "fatload mmc 0:1 0x21000000 
 at91-sama5d3_xplained.dtb; " \
                  "fatload mmc 0:1 0x22000000 zImage; " \
                  "bootz 0x22000000 - 0x21000000"
-#define CONFIG_SYS_MMC_ENV_DEV    0
  #else
  #define CONFIG_ENV_IS_NOWHERE

Quoted 2 lines

  #endif

Best Regards,
Bo Shen

Josh Wu

author

2015-01-19 07:06 UTC #4 lore raw

PATCH v2 2/3 ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card

In reply to Josh Wu

This patch will save U-Boot environment as a file: uboot.env, in FAT partition instead of in raw sector of MMC card.

This make us easier to manage the environment file.

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

---

 include/configs/sama5d3xek.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/sama5d3xek.h +6 -4

index f2849d7..c29f25b 100644
@@ -215,13 +215,15 @@
 				"bootm 0x22000000 - 0x21000000"
 #elif CONFIG_SYS_USE_MMC
 /* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET	0x2000
-#define CONFIG_ENV_SIZE		0x1000
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE
+#define FAT_ENV_INTERFACE	"mmc"
+#define FAT_ENV_FILE		"uboot.env"
+#define FAT_ENV_DEVICE_AND_PART	"0"
+#define CONFIG_ENV_SIZE		0x4000
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 dtb; " \
 				"fatload mmc 0:1 0x22000000 uImage; " \
 				"bootm 0x22000000 - 0x21000000"
-#define CONFIG_SYS_MMC_ENV_DEV	0
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #endif

Signature · 1 line

1.9.1

Bo Shen

2015-01-19 08:18 UTC #5 lore raw

PATCH v2 2/3 ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card

Hi Josh,

Quoted 6 lines · Josh Wu

This patch will save U-Boot environment as a file: uboot.env, in FAT partition instead of in raw sector of MMC card.
This make us easier to manage the environment file.
Signed-off-by Josh Wu <[email protected]>

Ackey-by Bo Shen <[email protected]>

Quoted 10 lines

---

  include/configs/sama5d3xek.h | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/sama5d3xek.h +0 -0

index f2849d7..c29f25b 100644

include/configs/sama5d3xek.h line 219

Quoted 8 lines

include/configs/sama5d3xek.h +2 -3

@@ -215,13 +215,15 @@
  				"bootm 0x22000000 - 0x21000000"
  #elif CONFIG_SYS_USE_MMC
  /* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET	0x2000
-#define CONFIG_ENV_SIZE		0x1000
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE

Nitpick:
Can you move in the following condition include? --->8---
#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) #define CONFIG_CMD_FAT
#endif
---8<---

include/configs/sama5d3xek.h line 229

Quoted 12 lines

include/configs/sama5d3xek.h +4 -1

+#define FAT_ENV_INTERFACE	"mmc"
+#define FAT_ENV_FILE		"uboot.env"
+#define FAT_ENV_DEVICE_AND_PART	"0"
+#define CONFIG_ENV_SIZE		0x4000
  #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 dtb; " \
  				"fatload mmc 0:1 0x22000000 uImage; " \
  				"bootm 0x22000000 - 0x21000000"
-#define CONFIG_SYS_MMC_ENV_DEV	0
  #else
  #define CONFIG_ENV_IS_NOWHERE
  #endif

Best Regards,
Bo Shen

Josh Wu

author

2015-01-19 09:18 UTC #6 lore raw

PATCH v2 2/3 ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card

Quoted 32 lines · Bo Shen

Hi Josh,
Quoted 7 lines · Josh Wu
This patch will save U-Boot environment as a file: uboot.env, in FAT partition
instead of in raw sector of MMC card.
This make us easier to manage the environment file.
Signed-off-by Josh Wu <[email protected]>
Ackey-by Bo Shen <[email protected]>
Quoted 10 lines
---
  include/configs/sama5d3xek.h | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
include/configs/sama5d3xek.h +0 -0
index f2849d7..c29f25b 100644
include/configs/sama5d3xek.h line 219
Quoted 8 lines
include/configs/sama5d3xek.h +2 -3
@@ -215,13 +215,15 @@
                  "bootm 0x22000000 - 0x21000000"
  #elif CONFIG_SYS_USE_MMC
  /* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET    0x2000
-#define CONFIG_ENV_SIZE        0x1000
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE

Quoted 7 lines

Nitpick:
Can you move in the following condition include? --->8---
#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) #define CONFIG_CMD_FAT
#endif
---8<---

sure, it's doable. I'll fix it in next version.

Best Regards,
Josh Wu

Quoted 16 lines

include/configs/sama5d3xek.h line 229

Quoted 13 lines

include/configs/sama5d3xek.h +4 -1

+#define FAT_ENV_INTERFACE    "mmc"
+#define FAT_ENV_FILE        "uboot.env"
+#define FAT_ENV_DEVICE_AND_PART    "0"
+#define CONFIG_ENV_SIZE        0x4000
  #define CONFIG_BOOTCOMMAND    "fatload mmc 0:1 0x21000000 dtb; " \
                  "fatload mmc 0:1 0x22000000 uImage; " \
                  "bootm 0x22000000 - 0x21000000"
-#define CONFIG_SYS_MMC_ENV_DEV    0
  #else
  #define CONFIG_ENV_IS_NOWHERE
  #endif

Best Regards,
Bo Shen

Josh Wu

author

2015-01-19 07:06 UTC #7 lore raw

PATCH v2 3/3 ARM: at91: at91sam9x5: save environment to a FAT file in MMC card

In reply to Josh Wu

This patch will save U-Boot environment as a file: uboot.env, in FAT partition instead of saving it in raw sector of MMC card.

This make us easier to manage the environment file.

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

---

 include/configs/at91sam9x5ek.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

include/configs/at91sam9x5ek.h +6 -5

index b1d4baa..6d8b71d 100644
@@ -203,11 +203,12 @@
 				"bootm 0x22000000"
 #else /* CONFIG_SYS_USE_MMC */
 /* bootstrap + u-boot + env + linux in mmc */
-#define CONFIG_ENV_IS_IN_MMC
-/* For FAT system, most cases it should be in the reserved sector */
-#define CONFIG_ENV_OFFSET	0x2000
-#define CONFIG_ENV_SIZE		0x1000
-#define CONFIG_SYS_MMC_ENV_DEV	0
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE
+#define FAT_ENV_INTERFACE	"mmc"
+#define FAT_ENV_FILE		"uboot.env"
+#define FAT_ENV_DEVICE_AND_PART "0"
+#define CONFIG_ENV_SIZE		0x4000
 #endif
 
 #ifdef CONFIG_SYS_USE_MMC

Signature · 1 line

1.9.1

Bo Shen

2015-01-19 08:21 UTC #8 lore raw

PATCH v2 3/3 ARM: at91: at91sam9x5: save environment to a FAT file in MMC card

Hi Josh,

Quoted 6 lines · Josh Wu

This patch will save U-Boot environment as a file: uboot.env, in FAT partition instead of saving it in raw sector of MMC card.
This make us easier to manage the environment file.
Signed-off-by Josh Wu <[email protected]>

Acked-by Bo Shen <[email protected]>

Quoted 18 lines

---

  include/configs/at91sam9x5ek.h | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)

include/configs/at91sam9x5ek.h +0 -4

index b1d4baa..6d8b71d 100644
@@ -203,11 +203,12 @@
  				"bootm 0x22000000"
  #else /* CONFIG_SYS_USE_MMC */
  /* bootstrap + u-boot + env + linux in mmc */
-#define CONFIG_ENV_IS_IN_MMC
-/* For FAT system, most cases it should be in the reserved sector */
-#define CONFIG_ENV_OFFSET	0x2000
-#define CONFIG_ENV_SIZE		0x1000

include/configs/at91sam9x5ek.h line 214

Quoted 10 lines

include/configs/at91sam9x5ek.h +6 -1

-#define CONFIG_SYS_MMC_ENV_DEV	0
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE
+#define FAT_ENV_INTERFACE	"mmc"
+#define FAT_ENV_FILE		"uboot.env"
+#define FAT_ENV_DEVICE_AND_PART "0"
+#define CONFIG_ENV_SIZE		0x4000
  #endif
 
  #ifdef CONFIG_SYS_USE_MMC

Best Regards,
Bo Shen

Josh Wu

author

2015-01-19 07:53 UTC #9 lore raw

v2 cover ARM: at91: save mmc environment in a FAT file instead of some sectors

In reply to Josh Wu

Quoted 6 lines · Josh Wu

I sent these patches days ago with other patches which refactor SAMA5 common configuration files, see URL:
   http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/203128/focus=203182
Since the patches which refactor SAMA5 common configuration files is rejected. So this time I only send the patches which only convert the mmc environment to FAT file.

Sorry, I forgot to add following changes:

Changes in v2:
- refined commit messages
- fix a compile error for at91sam9x5 mmc env file.

Best Regards,
Josh Wu

Quoted 12 lines

Josh Wu (3):
ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC
card
ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card
ARM: at91: at91sam9x5: save environment to a FAT file in MMC card
  include/configs/at91sam9x5ek.h     | 11 ++++++-----
  include/configs/sama5d3_xplained.h | 10 ++++++----
  include/configs/sama5d3xek.h       | 10 ++++++----
  3 files changed, 18 insertions(+), 13 deletions(-)