| Message ID | 08dbe18a8d310171b809127886cf5e3d9436e3f3.1568201315.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 7712fb1ff738802a81a3989ad988e7ac8c0d16ff |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | ARM: zynq: Boot variables cleanup | expand |
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 35191b2f813b..7cfe69db6935 100644 --- 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 283a78494116..824efa9c004b 100644 --- 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
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> --- board/xilinx/zynq/board.c | 2 +- include/configs/zynq-common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)