From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/11] ARM: at91: ma5d4: Swap SD/MMC controller order
Date: Tue, 2 May 2017 20:27:45 +0200 [thread overview]
Message-ID: <20170502182750.8907-6-marex@denx.de> (raw)
In-Reply-To: <20170502182750.8907-1-marex@denx.de>
The SDHCI1 is the primary boot controller on rev. 2.1 SoM, which
is the version available on the market. Swap the controller order
to match this and future versions of the SoM.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
---
board/aries/ma5d4evk/ma5d4evk.c | 5 ++---
include/configs/ma5d4evk.h | 10 +++++-----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/board/aries/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c
index 9c1ba58166..0293b29d0e 100644
--- a/board/aries/ma5d4evk/ma5d4evk.c
+++ b/board/aries/ma5d4evk/ma5d4evk.c
@@ -205,14 +205,13 @@ int board_mmc_init(bd_t *bis)
at91_set_pio_output(AT91_PIO_PORTE, 15, 1);
at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 15, 0);
- ret = atmel_mci_init((void *)ATMEL_BASE_MCI0);
+ ret = atmel_mci_init((void *)ATMEL_BASE_MCI1);
if (ret) /* eMMC init failed, skip it. */
at91_set_pio_output(AT91_PIO_PORTE, 15, 0);
/* Enable the power supply to On-board MicroSD */
at91_set_pio_output(AT91_PIO_PORTE, 17, 0);
-
- ret = atmel_mci_init((void *)ATMEL_BASE_MCI1);
+ ret = atmel_mci_init((void *)ATMEL_BASE_MCI0);
if (ret) /* uSD init failed, power it down. */
at91_set_pio_output(AT91_PIO_PORTE, 17, 1);
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index f317f07d80..f6c883dd70 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -137,9 +137,9 @@
"consdev=ttyS3\0" \
"baudrate=115200\0" \
"bootscript=boot.scr\0" \
- "bootdev=/dev/mmcblk1p1\0" \
- "bootpart=1:1\0" \
- "rootdev=/dev/mmcblk1p2\0" \
+ "bootdev=/dev/mmcblk0p1\0" \
+ "bootpart=0:1\0" \
+ "rootdev=/dev/mmcblk0p2\0" \
"netdev=eth0\0" \
"dfu_alt_info=mmc raw 0 3867148288\0" \
"kernel_addr_r=0x22000000\0" \
@@ -196,8 +196,8 @@
"bootm ${kernel_addr_r}\0" \
"try_bootscript=" \
"mmc rescan;" \
- "if test -e mmc ${bootpart} ${bootscript} ; then " \
- "if load mmc ${bootpart} ${kernel_addr_r} ${bootscript};"\
+ "if test -e mmc 1:1 ${bootscript} ; then " \
+ "if load mmc 1:1 ${kernel_addr_r} ${bootscript};" \
"then ; " \
"echo Running bootscript... ; " \
"source ${kernel_addr_r} ; " \
--
2.11.0
next prev parent reply other threads:[~2017-05-02 18:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 18:27 [U-Boot] [PATCH 01/11] ARM: atmel: Rename MA5D4EVK Marek Vasut
2017-05-02 18:27 ` [U-Boot] [PATCH 02/11] ARM: at91: ma5d4: Switch DDR2 controller to sequencial address decoding Marek Vasut
2017-06-30 1:26 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 03/11] ARM: at91: ma5d4: Reset CAN controllers late Marek Vasut
2017-06-30 1:26 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 04/11] ARM: at91: ma5d4: Enable DFU and UMS Marek Vasut
2017-06-30 1:26 ` [U-Boot] [U-Boot,04/11] " Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 05/11] ARM: at91: ma5d4: Init SD/MMC controller in SPL Marek Vasut
2017-06-30 1:27 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-02 18:27 ` Marek Vasut [this message]
2017-06-30 1:27 ` [U-Boot] [U-Boot, 06/11] ARM: at91: ma5d4: Swap SD/MMC controller order Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 07/11] ARM: at91: ma5d4: Enable support for booting from eMMC Marek Vasut
2017-06-30 1:27 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 08/11] ARM: at91: ma5d4: Boot from MMC2 when using SAM-BA Marek Vasut
2017-06-30 1:27 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 09/11] ARM: at91: ma5d4: Switch environment start to eMMC Marek Vasut
2017-06-30 1:27 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 10/11] ARM: at91: ma5d4: Enable random ethaddr Marek Vasut
2017-06-30 1:27 ` [U-Boot] [U-Boot, " Tom Rini
2017-05-02 18:27 ` [U-Boot] [PATCH 11/11] ARM: at91: ma5d4: Support both SF and eMMC SoMs Marek Vasut
2017-06-30 1:27 ` [U-Boot] [U-Boot, " Tom Rini
2017-06-30 1:26 ` [U-Boot] [U-Boot,01/11] ARM: atmel: Rename MA5D4EVK Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170502182750.8907-6-marex@denx.de \
--to=marex@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox