diff mbox

[U-Boot,2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support

Message ID 1400582283-31625-2-git-send-email-josh.wu@atmel.com
State Changes Requested, archived
Delegated to: Andreas Bießmann
Headers show

Commit Message

Josh Wu May 20, 2014, 10:38 a.m. UTC
In this configuration the environment will save in file: uboot.env of
mmc card.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
 boards.cfg                         |    1 +
 include/configs/at91sam9m10g45ek.h |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

Comments

Bo Shen May 21, 2014, 1:32 a.m. UTC | #1
Hi Josh,

On 05/20/2014 06:38 PM, Josh Wu wrote:
> In this configuration the environment will save in file: uboot.env of
> mmc card.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
>   boards.cfg                         |    1 +
>   include/configs/at91sam9m10g45ek.h |   20 ++++++++++++++++++++
>   2 files changed, 21 insertions(+)
>
> diff --git a/boards.cfg b/boards.cfg
> index 3a59686..9f7cfd8 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -102,6 +102,7 @@ Active  arm         arm926ejs      at91        atmel           at91sam9263ek
>   Active  arm         arm926ejs      at91        atmel           at91sam9263ek       at91sam9263ek_norflash                at91sam9263ek:AT91SAM9263,SYS_USE_NORFLASH                                                                                        Stelian Pop <stelian@popies.net>
>   Active  arm         arm926ejs      at91        atmel           at91sam9263ek       at91sam9263ek_norflash_boot           at91sam9263ek:AT91SAM9263,SYS_USE_BOOT_NORFLASH                                                                                   Stelian Pop <stelian@popies.net>
>   Active  arm         arm926ejs      at91        atmel           at91sam9m10g45ek    at91sam9m10g45ek_nandflash            at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH                                                                                 Bo Shen<voice.shen@atmel.com>
> +Active  arm         arm926ejs      at91        atmel           at91sam9m10g45ek    at91sam9m10g45ek_mmc                  at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_MMC                                                                                       Bo Shen<voice.shen@atmel.com>
>   Active  arm         arm926ejs      at91        atmel           at91sam9n12ek       at91sam9n12ek_mmc                     at91sam9n12ek:AT91SAM9N12,SYS_USE_MMC                                                                                             Josh Wu <josh.wu@atmel.com>
>   Active  arm         arm926ejs      at91        atmel           at91sam9n12ek       at91sam9n12ek_nandflash               at91sam9n12ek:AT91SAM9N12,SYS_USE_NANDFLASH                                                                                       Josh Wu <josh.wu@atmel.com>
>   Active  arm         arm926ejs      at91        atmel           at91sam9n12ek       at91sam9n12ek_spiflash                at91sam9n12ek:AT91SAM9N12,SYS_USE_SPIFLASH                                                                                        Josh Wu <josh.wu@atmel.com>
> diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
> index df277e7..07b2188 100644
> --- a/include/configs/at91sam9m10g45ek.h
> +++ b/include/configs/at91sam9m10g45ek.h
> @@ -147,6 +147,7 @@
>   #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
>   #define CONFIG_SYS_MEMTEST_END		0x23e00000
>
> +#ifdef CONFIG_SYS_USE_NANDFLASH
>   /* bootstrap + u-boot + env in nandflash */
>   #define CONFIG_ENV_IS_IN_NAND
>   #define CONFIG_ENV_OFFSET		0xc0000
> @@ -162,6 +163,25 @@
>   	"256k(env),256k(env_redundant),256k(spare),"			\
>   	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
>   	"root=/dev/mtdblock7 rw rootfstype=jffs2"
> +#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
> +#define FAT_ENV_FILE		"uboot.env"
> +#define CONFIG_ENV_IS_IN_FAT
> +#define CONFIG_FAT_WRITE
> +#define CONFIG_ENV_SIZE		0x4000
> +
> +#define CONFIG_BOOTARGS		"mem=128M console=ttyS0,115200 " \

I think we should remove "mem=128M" as we use device tree.

> +				"mtdparts=atmel_nand:" \
> +				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
> +				"root=/dev/mmcblk0p2 " \
> +				"rw rootfstype=ext4 rootwait"

Can we remove rootfstype, so it can compatible with ext2, ext3 and ext4.

> +#define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x71000000 dtb; " \
> +				"fatload mmc 0:1 0x72000000 uImage; " \
> +				"bootm 0x72000000 - 0x71000000"

Can we switch to zImage? As we try to support multi-platform with single 
image in kernel.

> +#endif
>
>   #define CONFIG_BAUDRATE			115200
>
>

Best Regards,
Bo Shen
Josh Wu May 21, 2014, 2:31 a.m. UTC | #2
Hi, Bo

On 5/21/2014 9:32 AM, Bo Shen wrote:
> Hi Josh,
>
> On 05/20/2014 06:38 PM, Josh Wu wrote:
>> In this configuration the environment will save in file: uboot.env of
>> mmc card.
>>
>> Signed-off-by: Josh Wu <josh.wu@atmel.com>
>> ---
>>   boards.cfg                         |    1 +
>>   include/configs/at91sam9m10g45ek.h |   20 ++++++++++++++++++++
>>   2 files changed, 21 insertions(+)
>>
>> diff --git a/boards.cfg b/boards.cfg
>> index 3a59686..9f7cfd8 100644
>> --- a/boards.cfg
>> +++ b/boards.cfg
>> @@ -102,6 +102,7 @@ Active  arm         arm926ejs at91        
>> atmel           at91sam9263ek
>>   Active  arm         arm926ejs      at91        atmel 
>> at91sam9263ek       at91sam9263ek_norflash 
>> at91sam9263ek:AT91SAM9263,SYS_USE_NORFLASH Stelian Pop 
>> <stelian@popies.net>
>>   Active  arm         arm926ejs      at91        atmel 
>> at91sam9263ek       at91sam9263ek_norflash_boot 
>> at91sam9263ek:AT91SAM9263,SYS_USE_BOOT_NORFLASH Stelian Pop 
>> <stelian@popies.net>
>>   Active  arm         arm926ejs      at91        atmel 
>> at91sam9m10g45ek    at91sam9m10g45ek_nandflash 
>> at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH Bo 
>> Shen<voice.shen@atmel.com>
>> +Active  arm         arm926ejs      at91        atmel 
>> at91sam9m10g45ek    at91sam9m10g45ek_mmc 
>> at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_MMC Bo 
>> Shen<voice.shen@atmel.com>
>>   Active  arm         arm926ejs      at91        atmel 
>> at91sam9n12ek       at91sam9n12ek_mmc 
>> at91sam9n12ek:AT91SAM9N12,SYS_USE_MMC Josh Wu <josh.wu@atmel.com>
>>   Active  arm         arm926ejs      at91        atmel 
>> at91sam9n12ek       at91sam9n12ek_nandflash 
>> at91sam9n12ek:AT91SAM9N12,SYS_USE_NANDFLASH Josh Wu <josh.wu@atmel.com>
>>   Active  arm         arm926ejs      at91        atmel 
>> at91sam9n12ek       at91sam9n12ek_spiflash 
>> at91sam9n12ek:AT91SAM9N12,SYS_USE_SPIFLASH Josh Wu <josh.wu@atmel.com>
>> diff --git a/include/configs/at91sam9m10g45ek.h 
>> b/include/configs/at91sam9m10g45ek.h
>> index df277e7..07b2188 100644
>> --- a/include/configs/at91sam9m10g45ek.h
>> +++ b/include/configs/at91sam9m10g45ek.h
>> @@ -147,6 +147,7 @@
>>   #define CONFIG_SYS_MEMTEST_START    CONFIG_SYS_SDRAM_BASE
>>   #define CONFIG_SYS_MEMTEST_END        0x23e00000
>>
>> +#ifdef CONFIG_SYS_USE_NANDFLASH
>>   /* bootstrap + u-boot + env in nandflash */
>>   #define CONFIG_ENV_IS_IN_NAND
>>   #define CONFIG_ENV_OFFSET        0xc0000
>> @@ -162,6 +163,25 @@
>>       "256k(env),256k(env_redundant),256k(spare),"            \
>>       "512k(dtb),6M(kernel)ro,-(rootfs) "                \
>>       "root=/dev/mtdblock7 rw rootfstype=jffs2"
>> +#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
>> +#define FAT_ENV_FILE        "uboot.env"
>> +#define CONFIG_ENV_IS_IN_FAT
>> +#define CONFIG_FAT_WRITE
>> +#define CONFIG_ENV_SIZE        0x4000
>> +
>> +#define CONFIG_BOOTARGS        "mem=128M console=ttyS0,115200 " \
>
> I think we should remove "mem=128M" as we use device tree.
>
>> +                "mtdparts=atmel_nand:" \
>> +                "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
>> +                "root=/dev/mmcblk0p2 " \
>> +                "rw rootfstype=ext4 rootwait"
>
> Can we remove rootfstype, so it can compatible with ext2, ext3 and ext4.
>
>> +#define CONFIG_BOOTCOMMAND    "fatload mmc 0:1 0x71000000 dtb; " \
>> +                "fatload mmc 0:1 0x72000000 uImage; " \
>> +                "bootm 0x72000000 - 0x71000000"
>
> Can we switch to zImage? As we try to support multi-platform with 
> single image in kernel.
>
>> +#endif
>>
>>   #define CONFIG_BAUDRATE            115200
>>
>>
>

I will update to v2 according to your advise. Thanks.

Best Regards,
Josh Wu

> Best Regards,
> Bo Shen
>
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 3a59686..9f7cfd8 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -102,6 +102,7 @@  Active  arm         arm926ejs      at91        atmel           at91sam9263ek
 Active  arm         arm926ejs      at91        atmel           at91sam9263ek       at91sam9263ek_norflash                at91sam9263ek:AT91SAM9263,SYS_USE_NORFLASH                                                                                        Stelian Pop <stelian@popies.net>
 Active  arm         arm926ejs      at91        atmel           at91sam9263ek       at91sam9263ek_norflash_boot           at91sam9263ek:AT91SAM9263,SYS_USE_BOOT_NORFLASH                                                                                   Stelian Pop <stelian@popies.net>
 Active  arm         arm926ejs      at91        atmel           at91sam9m10g45ek    at91sam9m10g45ek_nandflash            at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH                                                                                 Bo Shen<voice.shen@atmel.com>
+Active  arm         arm926ejs      at91        atmel           at91sam9m10g45ek    at91sam9m10g45ek_mmc                  at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_MMC                                                                                       Bo Shen<voice.shen@atmel.com>
 Active  arm         arm926ejs      at91        atmel           at91sam9n12ek       at91sam9n12ek_mmc                     at91sam9n12ek:AT91SAM9N12,SYS_USE_MMC                                                                                             Josh Wu <josh.wu@atmel.com>
 Active  arm         arm926ejs      at91        atmel           at91sam9n12ek       at91sam9n12ek_nandflash               at91sam9n12ek:AT91SAM9N12,SYS_USE_NANDFLASH                                                                                       Josh Wu <josh.wu@atmel.com>
 Active  arm         arm926ejs      at91        atmel           at91sam9n12ek       at91sam9n12ek_spiflash                at91sam9n12ek:AT91SAM9N12,SYS_USE_SPIFLASH                                                                                        Josh Wu <josh.wu@atmel.com>
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index df277e7..07b2188 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -147,6 +147,7 @@ 
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		0x23e00000
 
+#ifdef CONFIG_SYS_USE_NANDFLASH
 /* bootstrap + u-boot + env in nandflash */
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET		0xc0000
@@ -162,6 +163,25 @@ 
 	"256k(env),256k(env_redundant),256k(spare),"			\
 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
 	"root=/dev/mtdblock7 rw rootfstype=jffs2"
+#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
+#define FAT_ENV_FILE		"uboot.env"
+#define CONFIG_ENV_IS_IN_FAT
+#define CONFIG_FAT_WRITE
+#define CONFIG_ENV_SIZE		0x4000
+
+#define CONFIG_BOOTARGS		"mem=128M console=ttyS0,115200 " \
+				"mtdparts=atmel_nand:" \
+				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
+				"root=/dev/mmcblk0p2 " \
+				"rw rootfstype=ext4 rootwait"
+#define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x71000000 dtb; " \
+				"fatload mmc 0:1 0x72000000 uImage; " \
+				"bootm 0x72000000 - 0x71000000"
+#endif
 
 #define CONFIG_BAUDRATE			115200