ARM: zynq: Specify MMC controller number for boot sequence

Xilinx Zynq SoC has two sdhci controllers but boot is only possible from
the first one. That's why there is a need to specify controller number.
mmc1 is supposed to be secondary boot device and should be also listed in
distribution boot.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 35191b2f813b36a583fbec1ab79fb6846e6dee31..7cfe69db69359a1f92e1a736202e30314cf45bb7 100644 (file)
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -52,7 +52,7 @@ int board_late_init(void)
                env_set("modeboot", "norboot");
                break;
        case ZYNQ_BM_SD:
-               mode = "mmc";
+               mode = "mmc0";
                env_set("modeboot", "sdboot");
                break;
        case ZYNQ_BM_JTAG:

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 283a78494116a42d513a3d60cb8b2315d57db668..824efa9c004bcb0f752cec7ba752376511f8047a 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -111,7 +111,7 @@
 #else
 
 #ifdef CONFIG_CMD_MMC
-#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
+#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
 #else
 #define BOOT_TARGET_DEVICES_MMC(func)
 #endif