From: Sekhar Nori Date: Thu, 30 May 2019 13:34:54 +0000 (+0530) Subject: ARM: davinci: omal138_lcdk: fix MMC boot breakage due to driver model conversion X-Git-Tag: v2019.07-rc4~9^2~10 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4fddaf2b7d4ab23ec829bb208c892789447779e0;p=oweals%2Fu-boot.git ARM: davinci: omal138_lcdk: fix MMC boot breakage due to driver model conversion commit 21af33ed0319 ("ARM: davinci: omapl138_lcdk: Enable DM_MMC") wanted to enable DM_MMC only for U-Boot and not for SPL. But CONFIG_DM_MMC is defined for SPL build too. Because of this MMC device was not getting registered for SPL causing MMC/SD boot breakage. Instead use CONFIG_IS_ENABLED(DM_MMC) which will remain false until CONFIG_SPL_DM_MMC is defined. Tested-by: Adam Ford #da850evm Signed-off-by: Sekhar Nori Tested-by: Peter Howard #omapl138_lcdk --- diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 2c2f885d43..fe1bf44101 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -353,7 +353,7 @@ int misc_init_r(void) return 0; } -#ifndef CONFIG_DM_MMC +#if !CONFIG_IS_ENABLED(DM_MMC) #ifdef CONFIG_MMC_DAVINCI static struct davinci_mmc mmc_sd0 = { .reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE,