diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-15 21:21:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-15 21:21:28 -0500 |
| commit | d391c13c99a2b48c98cef6df4479247cd4e62f9d (patch) | |
| tree | 6e5c9790db8a4743cc74f1de52c549bc0dcc006b /arch/arm/mach-zynqmp/spl.c | |
| parent | e35171e94efdd0fa6c63083a682d452a2403bea1 (diff) | |
| parent | 91d7e0c47f51e73cd8357f023ffc7c217a3c7291 (diff) | |
Merge tag 'xilinx-for-v2019.04-rc2' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2019.04-rc2
xilinx:
- Start to use distro boot commands first
- Setup fdtfile on ZynqMP
- Move mac addr eeprom read to common location
- Convert to OF_SEPARATE
- Switch all board to DM_I2C
- Some DT syncs
i2c:
- Remove !DM_I2C zynq driver
versal:
- Enable some more features
- Add mini configurations
Diffstat (limited to 'arch/arm/mach-zynqmp/spl.c')
| -rw-r--r-- | arch/arm/mach-zynqmp/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index fb3955c93f..f6f5414201 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -85,7 +85,7 @@ u32 spl_boot_device(void) case SD_MODE1: case SD1_LSHFT_MODE: /* not working on silicon v1 */ /* if both controllers enabled, then these two are the second controller */ -#if defined(CONFIG_ZYNQ_SDHCI0) && defined(CONFIG_ZYNQ_SDHCI1) +#if defined(SPL_ZYNQMP_TWO_SDHCI) return BOOT_DEVICE_MMC2; /* else, fall through, the one SDHCI controller that is enabled is number 1 */ #endif |