summaryrefslogtreecommitdiffstats
path: root/include/configs/xilinx_zynqmp.h
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 /include/configs/xilinx_zynqmp.h
parent78678feeacc32f4fca9cb9a4aa9168396d8101c6 (diff)
downloadtalos-obmc-uboot-2d9925bce3060c91f2495e741a1220eb827338c0.tar.gz
talos-obmc-uboot-2d9925bce3060c91f2495e741a1220eb827338c0.zip
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 'include/configs/xilinx_zynqmp.h')
-rw-r--r--include/configs/xilinx_zynqmp.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 03f74508ef..2d9f020f50 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -156,8 +156,10 @@
"kernel_addr=0x80000\0" \
"fdt_addr=0x7000000\0" \
"fdt_high=0x10000000\0" \
- "sdboot=mmcinfo && load mmc 0:0 $fdt_addr system.dtb && " \
- "load mmc 0:0 $kernel_addr Image && booti $kernel_addr - $fdt_addr\0" \
+ "sdbootdev=0\0"\
+ "sdboot=mmc dev $sdbootdev && mmcinfo && load mmc $sdbootdev:$partid $fdt_addr system.dtb && " \
+ "load mmc $sdbootdev:$partid $kernel_addr Image && " \
+ "booti $kernel_addr - $fdt_addr\0" \
DFU_ALT_INFO
#define CONFIG_BOOTARGS "setenv bootargs console=ttyPS0,${baudrate} " \
OpenPOWER on IntegriCloud