Re: [U-Boot] [PATCH v3 1/2] ARM: davinci: omal138_lcdk: fix MMC boot breakage due to driver model conversion
On Thu, May 30, 2019 at 07:04:54PM +0530, Sekhar Nori wrote: > 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 Applied to u-boot/master, thanks! -- Tom signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/2] ARM: davinci: omal138_lcdk: fix MMC boot breakage due to driver model conversion
On Thu, 2019-05-30 at 19:04 +0530, Sekhar Nori wrote: > 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 Tested-by: Peter Howard #omapl138_lcdk > Signed-off-by: Sekhar Nori > --- > board/davinci/da8xxevm/omapl138_lcdk.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c > b/board/davinci/da8xxevm/omapl138_lcdk.c > index 2c2f885d43e4..fe1bf4410145 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, signature.asc Description: This is a digitally signed message part ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v3 1/2] 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 --- board/davinci/da8xxevm/omapl138_lcdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 2c2f885d43e4..fe1bf4410145 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, -- 2.16.2 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot