* [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support
@ 2014-05-20 10:38 Josh Wu
2014-05-20 10:38 ` [U-Boot] [PATCH 2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support Josh Wu
2014-05-21 1:27 ` [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support Bo Shen
0 siblings, 2 replies; 6+ messages in thread
From: Josh Wu @ 2014-05-20 10:38 UTC (permalink / raw)
To: u-boot
Enable mci0 support. And enable the mmc command in configuration file.
As both CONFIG_CMD_MMC and CONFIG_CMD_USB use the CONFIG_DOS_PARTITION,
so remove the redundant CONFIG_DOS_PARTITION definition.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 28 +++++++++++++++++++++++
include/configs/at91sam9m10g45ek.h | 15 +++++++++++-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index b7e2efd..fd6860b 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -15,7 +15,9 @@
#include <asm/arch/gpio.h>
#include <asm/arch/clk.h>
#include <lcd.h>
+#include <mmc.h>
#include <atmel_lcdc.h>
+#include <atmel_mci.h>
#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
#include <net.h>
#endif
@@ -217,6 +219,29 @@ void lcd_show_board_info(void)
#endif /* CONFIG_LCD_INFO */
#endif
+#ifdef CONFIG_GENERIC_ATMEL_MCI
+void at91sam9m10g45ek_mci_hw_init(void)
+{
+ struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
+
+ at91_set_a_periph(AT91_PIO_PORTA, 0, 0); /* MCI0 CLK */
+ at91_set_a_periph(AT91_PIO_PORTA, 1, 0); /* MCI0 CDA */
+ at91_set_a_periph(AT91_PIO_PORTA, 2, 0); /* MCI0 DB0 */
+ at91_set_a_periph(AT91_PIO_PORTA, 3, 0); /* MCI0 DB1 */
+ at91_set_a_periph(AT91_PIO_PORTA, 4, 0); /* MCI0 DB2 */
+ at91_set_a_periph(AT91_PIO_PORTA, 5, 0); /* MCI0 DB3 */
+
+ /* Enable clock */
+ writel(1 << ATMEL_ID_MCI0, &pmc->pcer);
+}
+
+int board_mmc_init(bd_t *bis)
+{
+ at91_set_pio_input(AT91_PIO_PORTD, 10, 0); /* MCI0 CD */
+ return atmel_mci_init((void *)ATMEL_BASE_MCI0);
+}
+#endif
+
int board_early_init_f(void)
{
at91_seriald_hw_init();
@@ -247,6 +272,9 @@ int board_init(void)
#ifdef CONFIG_ATMEL_SPI
at91_spi0_hw_init(1 << 4);
#endif
+#ifdef CONFIG_GENERIC_ATMEL_MCI
+ at91sam9m10g45ek_mci_hw_init();
+#endif
#ifdef CONFIG_MACB
at91sam9m10g45ek_macb_hw_init();
#endif
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index ccfda71..df277e7 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -115,6 +115,20 @@
#endif
+/* MMC */
+#define CONFIG_CMD_MMC
+
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_GENERIC_ATMEL_MCI
+#endif
+
+#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
+#define CONFIG_CMD_FAT
+#define CONFIG_DOS_PARTITION
+#endif
+
/* Ethernet */
#define CONFIG_MACB
#define CONFIG_RMII
@@ -126,7 +140,6 @@
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_ATMEL
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
-#define CONFIG_DOS_PARTITION
#define CONFIG_USB_STORAGE
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support
2014-05-20 10:38 [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support Josh Wu
@ 2014-05-20 10:38 ` Josh Wu
2014-05-21 1:32 ` Bo Shen
2014-05-21 1:27 ` [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support Bo Shen
1 sibling, 1 reply; 6+ messages in thread
From: Josh Wu @ 2014-05-20 10:38 UTC (permalink / raw)
To: u-boot
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 " \
+ "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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support
2014-05-20 10:38 [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support Josh Wu
2014-05-20 10:38 ` [U-Boot] [PATCH 2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support Josh Wu
@ 2014-05-21 1:27 ` Bo Shen
2014-05-21 2:33 ` Josh Wu
1 sibling, 1 reply; 6+ messages in thread
From: Bo Shen @ 2014-05-21 1:27 UTC (permalink / raw)
To: u-boot
Hi Josh,
On 05/20/2014 06:38 PM, Josh Wu wrote:
> Enable mci0 support. And enable the mmc command in configuration file.
>
> As both CONFIG_CMD_MMC and CONFIG_CMD_USB use the CONFIG_DOS_PARTITION,
> so remove the redundant CONFIG_DOS_PARTITION definition.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
> board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 28 +++++++++++++++++++++++
> include/configs/at91sam9m10g45ek.h | 15 +++++++++++-
> 2 files changed, 42 insertions(+), 1 deletion(-)
>
> diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> index b7e2efd..fd6860b 100644
> --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> @@ -15,7 +15,9 @@
> #include <asm/arch/gpio.h>
> #include <asm/arch/clk.h>
> #include <lcd.h>
> +#include <mmc.h>
> #include <atmel_lcdc.h>
> +#include <atmel_mci.h>
> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
> #include <net.h>
> #endif
> @@ -217,6 +219,29 @@ void lcd_show_board_info(void)
> #endif /* CONFIG_LCD_INFO */
> #endif
>
> +#ifdef CONFIG_GENERIC_ATMEL_MCI
> +void at91sam9m10g45ek_mci_hw_init(void)
> +{
> + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> +
> + at91_set_a_periph(AT91_PIO_PORTA, 0, 0); /* MCI0 CLK */
> + at91_set_a_periph(AT91_PIO_PORTA, 1, 0); /* MCI0 CDA */
> + at91_set_a_periph(AT91_PIO_PORTA, 2, 0); /* MCI0 DB0 */
> + at91_set_a_periph(AT91_PIO_PORTA, 3, 0); /* MCI0 DB1 */
> + at91_set_a_periph(AT91_PIO_PORTA, 4, 0); /* MCI0 DB2 */
> + at91_set_a_periph(AT91_PIO_PORTA, 5, 0); /* MCI0 DB3 */
The comments for pin should be DAx while not DBx.
> +
> + /* Enable clock */
> + writel(1 << ATMEL_ID_MCI0, &pmc->pcer);
> +}
> +
> +int board_mmc_init(bd_t *bis)
> +{
> + at91_set_pio_input(AT91_PIO_PORTD, 10, 0); /* MCI0 CD */
As we won't use it, so I think we should remove it.
> + return atmel_mci_init((void *)ATMEL_BASE_MCI0);
> +}
> +#endif
> +
> int board_early_init_f(void)
> {
> at91_seriald_hw_init();
> @@ -247,6 +272,9 @@ int board_init(void)
> #ifdef CONFIG_ATMEL_SPI
> at91_spi0_hw_init(1 << 4);
> #endif
> +#ifdef CONFIG_GENERIC_ATMEL_MCI
> + at91sam9m10g45ek_mci_hw_init();
> +#endif
> #ifdef CONFIG_MACB
> at91sam9m10g45ek_macb_hw_init();
> #endif
> diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
> index ccfda71..df277e7 100644
> --- a/include/configs/at91sam9m10g45ek.h
> +++ b/include/configs/at91sam9m10g45ek.h
> @@ -115,6 +115,20 @@
>
> #endif
>
> +/* MMC */
> +#define CONFIG_CMD_MMC
> +
> +#ifdef CONFIG_CMD_MMC
> +#define CONFIG_MMC
> +#define CONFIG_GENERIC_MMC
> +#define CONFIG_GENERIC_ATMEL_MCI
> +#endif
> +
> +#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
> +#define CONFIG_CMD_FAT
> +#define CONFIG_DOS_PARTITION
> +#endif
> +
> /* Ethernet */
> #define CONFIG_MACB
> #define CONFIG_RMII
> @@ -126,7 +140,6 @@
> #define CONFIG_USB_EHCI
> #define CONFIG_USB_EHCI_ATMEL
> #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
> -#define CONFIG_DOS_PARTITION
> #define CONFIG_USB_STORAGE
>
> #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
>
Best Regards,
Bo Shen
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support
2014-05-20 10:38 ` [U-Boot] [PATCH 2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support Josh Wu
@ 2014-05-21 1:32 ` Bo Shen
2014-05-21 2:31 ` Josh Wu
0 siblings, 1 reply; 6+ messages in thread
From: Bo Shen @ 2014-05-21 1:32 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support
2014-05-21 1:32 ` Bo Shen
@ 2014-05-21 2:31 ` Josh Wu
0 siblings, 0 replies; 6+ messages in thread
From: Josh Wu @ 2014-05-21 2:31 UTC (permalink / raw)
To: u-boot
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support
2014-05-21 1:27 ` [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support Bo Shen
@ 2014-05-21 2:33 ` Josh Wu
0 siblings, 0 replies; 6+ messages in thread
From: Josh Wu @ 2014-05-21 2:33 UTC (permalink / raw)
To: u-boot
Hi, Bo
On 5/21/2014 9:27 AM, Bo Shen wrote:
> Hi Josh,
>
> On 05/20/2014 06:38 PM, Josh Wu wrote:
>> Enable mci0 support. And enable the mmc command in configuration file.
>>
>> As both CONFIG_CMD_MMC and CONFIG_CMD_USB use the CONFIG_DOS_PARTITION,
>> so remove the redundant CONFIG_DOS_PARTITION definition.
>>
>> Signed-off-by: Josh Wu <josh.wu@atmel.com>
>> ---
>> board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 28
>> +++++++++++++++++++++++
>> include/configs/at91sam9m10g45ek.h | 15 +++++++++++-
>> 2 files changed, 42 insertions(+), 1 deletion(-)
>>
>> diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
>> b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
>> index b7e2efd..fd6860b 100644
>> --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
>> +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
>> @@ -15,7 +15,9 @@
>> #include <asm/arch/gpio.h>
>> #include <asm/arch/clk.h>
>> #include <lcd.h>
>> +#include <mmc.h>
>> #include <atmel_lcdc.h>
>> +#include <atmel_mci.h>
>> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
>> #include <net.h>
>> #endif
>> @@ -217,6 +219,29 @@ void lcd_show_board_info(void)
>> #endif /* CONFIG_LCD_INFO */
>> #endif
>>
>> +#ifdef CONFIG_GENERIC_ATMEL_MCI
>> +void at91sam9m10g45ek_mci_hw_init(void)
>> +{
>> + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
>> +
>> + at91_set_a_periph(AT91_PIO_PORTA, 0, 0); /* MCI0 CLK */
>> + at91_set_a_periph(AT91_PIO_PORTA, 1, 0); /* MCI0 CDA */
>> + at91_set_a_periph(AT91_PIO_PORTA, 2, 0); /* MCI0 DB0 */
>> + at91_set_a_periph(AT91_PIO_PORTA, 3, 0); /* MCI0 DB1 */
>> + at91_set_a_periph(AT91_PIO_PORTA, 4, 0); /* MCI0 DB2 */
>> + at91_set_a_periph(AT91_PIO_PORTA, 5, 0); /* MCI0 DB3 */
>
> The comments for pin should be DAx while not DBx.
I'll fix it in v2.
>
>> +
>> + /* Enable clock */
>> + writel(1 << ATMEL_ID_MCI0, &pmc->pcer);
>> +}
>> +
>> +int board_mmc_init(bd_t *bis)
>> +{
>> + at91_set_pio_input(AT91_PIO_PORTD, 10, 0); /* MCI0 CD */
>
> As we won't use it, so I think we should remove it.
Okay. Thanks.
Best Regards,
Josh Wu
>
>> + return atmel_mci_init((void *)ATMEL_BASE_MCI0);
>> +}
>> +#endif
>> +
>> int board_early_init_f(void)
>> {
>> at91_seriald_hw_init();
>> @@ -247,6 +272,9 @@ int board_init(void)
>> #ifdef CONFIG_ATMEL_SPI
>> at91_spi0_hw_init(1 << 4);
>> #endif
>> +#ifdef CONFIG_GENERIC_ATMEL_MCI
>> + at91sam9m10g45ek_mci_hw_init();
>> +#endif
>> #ifdef CONFIG_MACB
>> at91sam9m10g45ek_macb_hw_init();
>> #endif
>> diff --git a/include/configs/at91sam9m10g45ek.h
>> b/include/configs/at91sam9m10g45ek.h
>> index ccfda71..df277e7 100644
>> --- a/include/configs/at91sam9m10g45ek.h
>> +++ b/include/configs/at91sam9m10g45ek.h
>> @@ -115,6 +115,20 @@
>>
>> #endif
>>
>> +/* MMC */
>> +#define CONFIG_CMD_MMC
>> +
>> +#ifdef CONFIG_CMD_MMC
>> +#define CONFIG_MMC
>> +#define CONFIG_GENERIC_MMC
>> +#define CONFIG_GENERIC_ATMEL_MCI
>> +#endif
>> +
>> +#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
>> +#define CONFIG_CMD_FAT
>> +#define CONFIG_DOS_PARTITION
>> +#endif
>> +
>> /* Ethernet */
>> #define CONFIG_MACB
>> #define CONFIG_RMII
>> @@ -126,7 +140,6 @@
>> #define CONFIG_USB_EHCI
>> #define CONFIG_USB_EHCI_ATMEL
>> #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
>> -#define CONFIG_DOS_PARTITION
>> #define CONFIG_USB_STORAGE
>>
>> #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
>>
>
> Best Regards,
> Bo Shen
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-21 2:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-20 10:38 [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support Josh Wu
2014-05-20 10:38 ` [U-Boot] [PATCH 2/2] ARM: at91sam9m10g45ek: add mmc environment configuration support Josh Wu
2014-05-21 1:32 ` Bo Shen
2014-05-21 2:31 ` Josh Wu
2014-05-21 1:27 ` [U-Boot] [PATCH 1/2] ARM: at91sam9m10g45ek: enable mci0 support Bo Shen
2014-05-21 2:33 ` Josh Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox