summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-11-06 10:22:37 +0100
committerMichal Simek <michal.simek@xilinx.com>2016-01-27 15:55:57 +0100
commit2d9925bce3060c91f2495e741a1220eb827338c0 (patch)
treea7d8d61ce32fa92539c59ae0023995b742e4e174 /board
parent78678feeacc32f4fca9cb9a4aa9168396d8101c6 (diff)
downloadu-boot-imx-2d9925bce3060c91f2495e741a1220eb827338c0.zip
u-boot-imx-2d9925bce3060c91f2495e741a1220eb827338c0.tar.gz
u-boot-imx-2d9925bce3060c91f2495e741a1220eb827338c0.tar.bz2
ARM64: zynqmp: Fix bootmode SD_MODE1
When only sdhci1 IP is enabled and SD_MODE1 bootmode is selected U-Boot using sdboot1 variable which refers to mmc dev 1. But this device doesn't exist because only one controller is available. This patch fix logic around sdboot mode with using sdbootdev internal variable. Reported-by: Chris Kohn <ckohn@xilinx.com> Acked-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'board')
-rw-r--r--board/xilinx/zynqmp/zynqmp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index a1d3fef..ac23625 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -103,7 +103,10 @@ int board_late_init(void)
break;
case SD_MODE1:
puts("SD_MODE1\n");
- setenv("modeboot", "sdboot1");
+#if defined(CONFIG_ZYNQ_SDHCI0) && defined(CONFIG_ZYNQ_SDHCI1)
+ setenv("sdbootdev", "1");
+#endif
+ setenv("modeboot", "sdboot");
break;
case NAND_MODE:
puts("NAND_MODE\n");