[U-Boot] [PATCH] arm64: zynqmp: fix preprocessor check for SPL_ZYNQMP_TWO_SDHCI

Michal Simek michal.simek at xilinx.com
Tue Apr 16 09:49:54 UTC 2019


On 15. 04. 19 16:18, Luca Ceresoli wrote:
> 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 at lucaceresoli.net>
> ---
>  arch/arm/mach-zynqmp/spl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
> index f6f5414201b5..b7d2ecdf7257 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(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
> 

Nice catch. Applied.

Thanks,
Michal


More information about the U-Boot mailing list