]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm64: zynqmp: fix preprocessor check for SPL_ZYNQMP_TWO_SDHCI
authorLuca Ceresoli <luca@lucaceresoli.net>
Mon, 15 Apr 2019 14:18:18 +0000 (16:18 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 16 Apr 2019 09:52:02 +0000 (11:52 +0200)
A missing CONFIG_ prefix while checking for this Kconfig variable makes the
check always fail. Fix it. While there also switch from the '#if defined'
form to the '#ifdef' form as the other checks in this function.

Fixes: 35e2b92344b1 ("arm64: zynqmp: Fix logic around CONFIG_ZYNQ_SDHCI")
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/mach-zynqmp/spl.c

index f95a264230e0c2a1233bcbea4f735a75e6896504..b52ac1785352bfc4b39c9113d1397c25061e70b0 100644 (file)
@@ -86,7 +86,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(SPL_ZYNQMP_TWO_SDHCI)
+#ifdef CONFIG_SPL_ZYNQMP_TWO_SDHCI
                return BOOT_DEVICE_MMC2;
 /* else, fall through, the one SDHCI controller that is enabled is number 1 */
 #endif