* [U-Boot] [PATCH 1/2] ARM: at91: at91sam9rlek: add mci support
2015-02-02 9:50 [U-Boot] [PATCH 0/2] ARM: at91: at91sam9rlek: add mmc config for at91sam9rlek Josh Wu
@ 2015-02-02 9:51 ` Josh Wu
2015-03-18 22:36 ` [U-Boot] [U-Boot,1/2] " Andreas Bießmann
2015-02-02 9:51 ` [U-Boot] [PATCH 2/2] ARM: at91: at91sam9rlek: add mmc environment configuration Josh Wu
2015-02-03 1:28 ` [U-Boot] [PATCH 0/2] ARM: at91: at91sam9rlek: add mmc config for at91sam9rlek Bo Shen
2 siblings, 1 reply; 6+ messages in thread
From: Josh Wu @ 2015-02-02 9:51 UTC (permalink / raw)
To: u-boot
This patch enable the MCI support for at91sam9rlek board.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c | 17 +++++++++++++++++
board/atmel/at91sam9rlek/at91sam9rlek.c | 10 ++++++++++
include/configs/at91sam9rlek.h | 11 +++++++++++
3 files changed, 38 insertions(+)
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c
index 0ec32c3..857c864 100644
--- a/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c
@@ -101,3 +101,20 @@ void at91_spi0_hw_init(unsigned long cs_mask)
}
}
#endif
+
+#ifdef CONFIG_GENERIC_ATMEL_MCI
+void at91_mci_hw_init(void)
+{
+ struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
+
+ at91_set_a_periph(AT91_PIO_PORTA, 2, 0); /* MCI CLK */
+ at91_set_a_periph(AT91_PIO_PORTA, 1, 0); /* MCI CDA */
+ at91_set_a_periph(AT91_PIO_PORTA, 0, 0); /* MCI DA0 */
+ at91_set_a_periph(AT91_PIO_PORTA, 3, 0); /* MCI DA1 */
+ at91_set_a_periph(AT91_PIO_PORTA, 4, 0); /* MCI DA2 */
+ at91_set_a_periph(AT91_PIO_PORTA, 5, 0); /* MCI DA3 */
+
+ /* Enable clock */
+ writel(1 << ATMEL_ID_MCI, &pmc->pcer);
+}
+#endif
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 56ca1d4..f995cef 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -19,6 +19,7 @@
#include <lcd.h>
#include <atmel_lcdc.h>
+#include <atmel_mci.h>
#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
#include <net.h>
#endif
@@ -162,6 +163,15 @@ void lcd_show_board_info(void)
#endif /* CONFIG_LCD_INFO */
#endif
+#ifdef CONFIG_GENERIC_ATMEL_MCI
+int board_mmc_init(bd_t *bis)
+{
+ at91_mci_hw_init();
+
+ return atmel_mci_init((void *)ATMEL_BASE_MCI);
+}
+#endif
+
int board_early_init_f(void)
{
struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index f790fcf..c15e999 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -124,6 +124,17 @@
#endif
+/* MMC */
+#define CONFIG_CMD_MMC
+
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_GENERIC_ATMEL_MCI
+#define CONFIG_CMD_FAT
+#define CONFIG_DOS_PARTITION
+#endif
+
/* Ethernet - not present */
/* USB - not supported */
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [U-Boot,1/2] ARM: at91: at91sam9rlek: add mci support
2015-02-02 9:51 ` [U-Boot] [PATCH 1/2] ARM: at91: at91sam9rlek: add mci support Josh Wu
@ 2015-03-18 22:36 ` Andreas Bießmann
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Bießmann @ 2015-03-18 22:36 UTC (permalink / raw)
To: u-boot
Dear Josh Wu,
Josh Wu <Josh.wu@atmel.com> writes:
>This patch enable the MCI support for at91sam9rlek board.
>
>Signed-off-by: Josh Wu <josh.wu@atmel.com>
>[rebase on ToT]
>Signed-off-by: Andreas Bie?mann <andreas.devel@googlemail.com>
>---
>
> arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c | 17 +++++++++++++++++
> board/atmel/at91sam9rlek/at91sam9rlek.c | 10 ++++++++++
> include/configs/at91sam9rlek.h | 11 +++++++++++
> 3 files changed, 38 insertions(+)
applied to u-boot-atmel/master, thanks!
Best regards,
Andreas Bie?mann
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: at91: at91sam9rlek: add mmc environment configuration
2015-02-02 9:50 [U-Boot] [PATCH 0/2] ARM: at91: at91sam9rlek: add mmc config for at91sam9rlek Josh Wu
2015-02-02 9:51 ` [U-Boot] [PATCH 1/2] ARM: at91: at91sam9rlek: add mci support Josh Wu
@ 2015-02-02 9:51 ` Josh Wu
2015-03-18 22:37 ` [U-Boot] [U-Boot, " Andreas Bießmann
2015-02-03 1:28 ` [U-Boot] [PATCH 0/2] ARM: at91: at91sam9rlek: add mmc config for at91sam9rlek Bo Shen
2 siblings, 1 reply; 6+ messages in thread
From: Josh Wu @ 2015-02-02 9:51 UTC (permalink / raw)
To: u-boot
Add a mmc default config, which will save the environment in a FAT file
(uboot.env) of MMC.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
configs/at91sam9rlek_mmc_defconfig | 3 +++
include/configs/at91sam9rlek.h | 18 +++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 configs/at91sam9rlek_mmc_defconfig
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
new file mode 100644
index 0000000..b93c881
--- /dev/null
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
+CONFIG_ARM=y
+CONFIG_TARGET_AT91SAM9RLEK=y
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index c15e999..122844d 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -158,7 +158,7 @@
"mtdparts=atmel_nand:-(root) "\
"rw rootfstype=jffs2"
-#else /* CONFIG_SYS_USE_NANDFLASH */
+#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
@@ -173,6 +173,22 @@
"512k(dtb),6M(kernel)ro,-(rootfs) " \
"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
+#else /* CONFIG_SYS_USE_MMC */
+
+/* bootstrap + u-boot + env + linux in mmc */
+#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 at91sam9rlek.dtb; " \
+ "fatload mmc 0:1 0x22000000 zImage; " \
+ "bootz 0x22000000 - 0x21000000"
+#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
+ "mtdparts=atmel_nand:" \
+ "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
+ "root=/dev/mmcblk0p2 rw rootwait"
#endif
#define CONFIG_SYS_PROMPT "U-Boot> "
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 0/2] ARM: at91: at91sam9rlek: add mmc config for at91sam9rlek
2015-02-02 9:50 [U-Boot] [PATCH 0/2] ARM: at91: at91sam9rlek: add mmc config for at91sam9rlek Josh Wu
2015-02-02 9:51 ` [U-Boot] [PATCH 1/2] ARM: at91: at91sam9rlek: add mci support Josh Wu
2015-02-02 9:51 ` [U-Boot] [PATCH 2/2] ARM: at91: at91sam9rlek: add mmc environment configuration Josh Wu
@ 2015-02-03 1:28 ` Bo Shen
2 siblings, 0 replies; 6+ messages in thread
From: Bo Shen @ 2015-02-03 1:28 UTC (permalink / raw)
To: u-boot
Hi Josh,
On 02/02/2015 05:50 PM, Josh Wu wrote:
> This patch series will enable mmc support on at91sam9rlek board. And
> also add a MMC config for it.
>
>
> Josh Wu (2):
> ARM: at91: at91sam9rlek: add mci support
> ARM: at91: at91sam9rlek: add mmc environment configuration
For this series:
Acked-by: Bo Shen <voice.shen@atmel.com>
> arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c | 17 ++++++++++++++
> board/atmel/at91sam9rlek/at91sam9rlek.c | 10 ++++++++
> configs/at91sam9rlek_mmc_defconfig | 3 +++
> include/configs/at91sam9rlek.h | 29 +++++++++++++++++++++++-
> 4 files changed, 58 insertions(+), 1 deletion(-)
> create mode 100644 configs/at91sam9rlek_mmc_defconfig
>
Best Regards,
Bo Shen
^ permalink raw reply [flat|nested] 6+ messages in thread