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

In this configuration the environment will save in file: uboot.env of
mmc card.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
v1 -> v2:
  1. remove mem=128m and roottype in bootargs.
  2. default boot command use zImage instead of uImage.

 boards.cfg                         |    1 +
 include/configs/at91sam9m10g45ek.h |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

Hi Josh,

On 05/21/2014 10:42 AM, 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>

Acked-by: Bo Shen <voice.shen@atmel.com>

> ---
> v1 -> v2:
>    1. remove mem=128m and roottype in bootargs.
>    2. default boot command use zImage instead of uImage.
>
>   boards.cfg                         |    1 +
>   include/configs/at91sam9m10g45ek.h |   19 +++++++++++++++++++
>   2 files changed, 20 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..cab3bb5 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,24 @@
>   	"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		"console=ttyS0,115200 " \
> +				"mtdparts=atmel_nand:" \
> +				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
> +				"root=/dev/mmcblk0p2 rw rootwait"
> +#define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x71000000 dtb; " \
> +				"fatload mmc 0:1 0x72000000 zImage; " \
> +				"bootz 0x72000000 - 0x71000000"
> +#endif
>
>   #define CONFIG_BAUDRATE			115200
>
>

Best Regards,
Bo Shen

Dear Josh Wu,

Josh Wu <Josh.wu@atmel.com> writes:
>In this configuration the environment will save in file: uboot.env of
>mmc card.
>
>Signed-off-by: Josh Wu <josh.wu@atmel.com>
>
>---
>v1 -> v2:
>  1. remove mem=128m and roottype in bootargs.
>  2. default boot command use zImage instead of uImage.
>
> boards.cfg                         |    1 +
> include/configs/at91sam9m10g45ek.h |   19 +++++++++++++++++++
> 2 files changed, 20 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bießmann