]> git.ipfire.org Git - people/ms/u-boot.git/commit
arm64: zynqmp: spl: fix dual SD controller support
authorJean-Francois Dagenais <jeff.dagenais@gmail.com>
Mon, 3 Apr 2017 01:44:34 +0000 (21:44 -0400)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 19 Jun 2017 14:53:09 +0000 (16:53 +0200)
commite3fdf5d05659dbe5ce3f9661a4eb3202005b2be2
tree39e229ae370d120bd064ab3312ccd18d6690ef8f
parentbd89fba2024305ae301fa7df80848b8d3e13efaf
arm64: zynqmp: spl: fix dual SD controller support

When enabling both SDHCI controllers, spl_mmc.c would actually choose
device sdhci0 even if booted from sdhci1 (boot_device). This is because
spl_mmc_get_device_index(boot_device) expects BOOT_DEVICE_MMC2[_2] in
order to return index 1 instead of 0.

The #if defined(...) statement is copied from board/xilinx/zynqmp/zynqmp.c

So the key to properly enabling both controllers as boot sources is
defining both CONFIG_ZYNQ_SDHCI0 and CONFIG_ZYNQ_SDHCI1 in your board's
include/configs/*.h.

Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/cpu/armv8/zynqmp/spl.c