* [U-Boot] [PATCH v2 1/3] ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card
2015-01-19 7:06 [U-Boot] [PATCH v2 0/3] ARM: at91: save mmc environment in a FAT file instead of some sectors Josh Wu
@ 2015-01-19 7:06 ` Josh Wu
2015-01-19 8:16 ` Bo Shen
2015-01-19 7:06 ` [U-Boot] [PATCH v2 2/3] ARM: at91: sama5d3xek: save enviroment as " Josh Wu
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Josh Wu @ 2015-01-19 7:06 UTC (permalink / raw)
To: u-boot
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 <josh.wu@atmel.com>
---
include/configs/sama5d3_xplained.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index d5588b1..a697035 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH v2 1/3] ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card
2015-01-19 7:06 ` [U-Boot] [PATCH v2 1/3] ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card Josh Wu
@ 2015-01-19 8:16 ` Bo Shen
2015-01-19 8:55 ` Josh Wu
0 siblings, 1 reply; 10+ messages in thread
From: Bo Shen @ 2015-01-19 8:16 UTC (permalink / raw)
To: u-boot
Hi Josh,
On 01/19/2015 03:06 PM, Josh Wu wrote:
> 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 <josh.wu@atmel.com>
After you remove the duplicated definition.
Acked-by: Bo Shen <voice.shen@atmel.com>
> ---
>
> include/configs/sama5d3_xplained.h | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
> index d5588b1..a697035 100644
> --- a/include/configs/sama5d3_xplained.h
> +++ b/include/configs/sama5d3_xplained.h
> @@ -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---
> +#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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 1/3] ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card
2015-01-19 8:16 ` Bo Shen
@ 2015-01-19 8:55 ` Josh Wu
0 siblings, 0 replies; 10+ messages in thread
From: Josh Wu @ 2015-01-19 8:55 UTC (permalink / raw)
To: u-boot
On 1/19/2015 4:16 PM, Bo Shen wrote:
> Hi Josh,
>
> On 01/19/2015 03:06 PM, Josh Wu wrote:
>> 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 <josh.wu@atmel.com>
>
> After you remove the duplicated definition.
>
> Acked-by: Bo Shen <voice.shen@atmel.com>
Thanks.
>
>> ---
>>
>> include/configs/sama5d3_xplained.h | 10 ++++++----
>> 1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/include/configs/sama5d3_xplained.h
>> b/include/configs/sama5d3_xplained.h
>> index d5588b1..a697035 100644
>> --- a/include/configs/sama5d3_xplained.h
>> +++ b/include/configs/sama5d3_xplained.h
>> @@ -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---
Okay, you are right. Will do.
Best Regards,
Josh Wu
>
>> +#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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 2/3] ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card
2015-01-19 7:06 [U-Boot] [PATCH v2 0/3] ARM: at91: save mmc environment in a FAT file instead of some sectors Josh Wu
2015-01-19 7:06 ` [U-Boot] [PATCH v2 1/3] ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card Josh Wu
@ 2015-01-19 7:06 ` Josh Wu
2015-01-19 8:18 ` Bo Shen
2015-01-19 7:06 ` [U-Boot] [PATCH v2 3/3] ARM: at91: at91sam9x5: save environment to " Josh Wu
2015-01-19 7:53 ` [U-Boot] [PATCH v2 0/3] ARM: at91: save mmc environment in a FAT file instead of some sectors Josh Wu
3 siblings, 1 reply; 10+ messages in thread
From: Josh Wu @ 2015-01-19 7:06 UTC (permalink / raw)
To: u-boot
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 <josh.wu@atmel.com>
---
include/configs/sama5d3xek.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index f2849d7..c29f25b 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 2/3] ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card
2015-01-19 7:06 ` [U-Boot] [PATCH v2 2/3] ARM: at91: sama5d3xek: save enviroment as " Josh Wu
@ 2015-01-19 8:18 ` Bo Shen
2015-01-19 9:18 ` Josh Wu
0 siblings, 1 reply; 10+ messages in thread
From: Bo Shen @ 2015-01-19 8:18 UTC (permalink / raw)
To: u-boot
Hi Josh,
On 01/19/2015 03:06 PM, Josh Wu wrote:
> 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 <josh.wu@atmel.com>
Ackey-by: Bo Shen <voice.shen@atmel.com>
> ---
>
> include/configs/sama5d3xek.h | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
> index f2849d7..c29f25b 100644
> --- a/include/configs/sama5d3xek.h
> +++ b/include/configs/sama5d3xek.h
> @@ -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<---
> +#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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 2/3] ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card
2015-01-19 8:18 ` Bo Shen
@ 2015-01-19 9:18 ` Josh Wu
0 siblings, 0 replies; 10+ messages in thread
From: Josh Wu @ 2015-01-19 9:18 UTC (permalink / raw)
To: u-boot
On 1/19/2015 4:18 PM, Bo Shen wrote:
> Hi Josh,
>
> On 01/19/2015 03:06 PM, Josh Wu wrote:
>> 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 <josh.wu@atmel.com>
>
> Ackey-by: Bo Shen <voice.shen@atmel.com>
>
>> ---
>>
>> include/configs/sama5d3xek.h | 10 ++++++----
>> 1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
>> index f2849d7..c29f25b 100644
>> --- a/include/configs/sama5d3xek.h
>> +++ b/include/configs/sama5d3xek.h
>> @@ -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<---
sure, it's doable. I'll fix it in next version.
Best Regards,
Josh Wu
>
>> +#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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 3/3] ARM: at91: at91sam9x5: save environment to a FAT file in MMC card
2015-01-19 7:06 [U-Boot] [PATCH v2 0/3] ARM: at91: save mmc environment in a FAT file instead of some sectors Josh Wu
2015-01-19 7:06 ` [U-Boot] [PATCH v2 1/3] ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card Josh Wu
2015-01-19 7:06 ` [U-Boot] [PATCH v2 2/3] ARM: at91: sama5d3xek: save enviroment as " Josh Wu
@ 2015-01-19 7:06 ` Josh Wu
2015-01-19 8:21 ` Bo Shen
2015-01-19 7:53 ` [U-Boot] [PATCH v2 0/3] ARM: at91: save mmc environment in a FAT file instead of some sectors Josh Wu
3 siblings, 1 reply; 10+ messages in thread
From: Josh Wu @ 2015-01-19 7:06 UTC (permalink / raw)
To: u-boot
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 <josh.wu@atmel.com>
---
include/configs/at91sam9x5ek.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index b1d4baa..6d8b71d 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 3/3] ARM: at91: at91sam9x5: save environment to a FAT file in MMC card
2015-01-19 7:06 ` [U-Boot] [PATCH v2 3/3] ARM: at91: at91sam9x5: save environment to " Josh Wu
@ 2015-01-19 8:21 ` Bo Shen
0 siblings, 0 replies; 10+ messages in thread
From: Bo Shen @ 2015-01-19 8:21 UTC (permalink / raw)
To: u-boot
Hi Josh,
On 01/19/2015 03:06 PM, Josh Wu wrote:
> 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 <josh.wu@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
> ---
>
> include/configs/at91sam9x5ek.h | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
> index b1d4baa..6d8b71d 100644
> --- a/include/configs/at91sam9x5ek.h
> +++ b/include/configs/at91sam9x5ek.h
> @@ -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
>
Best Regards,
Bo Shen
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v2 0/3] ARM: at91: save mmc environment in a FAT file instead of some sectors
2015-01-19 7:06 [U-Boot] [PATCH v2 0/3] ARM: at91: save mmc environment in a FAT file instead of some sectors Josh Wu
` (2 preceding siblings ...)
2015-01-19 7:06 ` [U-Boot] [PATCH v2 3/3] ARM: at91: at91sam9x5: save environment to " Josh Wu
@ 2015-01-19 7:53 ` Josh Wu
3 siblings, 0 replies; 10+ messages in thread
From: Josh Wu @ 2015-01-19 7:53 UTC (permalink / raw)
To: u-boot
On 1/19/2015 3:06 PM, Josh Wu wrote:
> 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
>
> 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(-)
>
^ permalink raw reply [flat|nested] 10+ messages in thread