diff mbox series

[U-Boot,v2] mx6slevk: Fix MMC breakage for the SPL target

Message ID 1507901246-25894-1-git-send-email-festevam@gmail.com
State Accepted
Commit 723dfe8f020cc5786baadb5f91f3efacc03165bf
Delegated to: Stefano Babic
Headers show
Series [U-Boot,v2] mx6slevk: Fix MMC breakage for the SPL target | expand

Commit Message

Fabio Estevam Oct. 13, 2017, 1:27 p.m. UTC 
From: Fabio Estevam <fabio.estevam@nxp.com>

Commit 001cdbbb32ef1f6 ("imx: mx6slevk: enable more DM drivers") breaks
MMC support in U-Boot proper on the mx6slevk_spl_defconfig target:

U-Boot SPL 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18)
Trying to boot from MMC1

U-Boot 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18 -0300)

CPU:   Freescale i.MX6SL rev1.0 792 MHz (running at 396 MHz)
CPU:   Commercial temperature grade (0C to 95C) at 33C
Reset cause: POR
Board: MX6SLEVK
I2C:   ready
DRAM:  1 GiB
MMC:   FSL_SDHC: 0
MMC Device 1 not found
*** Warning - No MMC card found, using default environment

As mx6slevk_spl_defconfig does not use CONFIG_DM_MMC and its
board file does not register the mmc controller for U-Boot proper,
let's fix this by adding CONFIG_DM_MMC=y and device tree support.

While at it, add more DM drivers, so that it becomes closer to 
mx6slevk_defconfig.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
Changes since v1:
- Fix the breakage by adding CONFIG_DM_MMC=y

 configs/mx6slevk_spl_defconfig | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

Comments

Fabio Estevam Oct. 30, 2017, 10:42 p.m. UTC | #1 
Hi Stefano,

On Fri, Oct 13, 2017 at 10:27 AM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> Commit 001cdbbb32ef1f6 ("imx: mx6slevk: enable more DM drivers") breaks
> MMC support in U-Boot proper on the mx6slevk_spl_defconfig target:
>
> U-Boot SPL 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18)
> Trying to boot from MMC1
>
> U-Boot 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18 -0300)
>
> CPU:   Freescale i.MX6SL rev1.0 792 MHz (running at 396 MHz)
> CPU:   Commercial temperature grade (0C to 95C) at 33C
> Reset cause: POR
> Board: MX6SLEVK
> I2C:   ready
> DRAM:  1 GiB
> MMC:   FSL_SDHC: 0
> MMC Device 1 not found
> *** Warning - No MMC card found, using default environment
>
> As mx6slevk_spl_defconfig does not use CONFIG_DM_MMC and its
> board file does not register the mmc controller for U-Boot proper,
> let's fix this by adding CONFIG_DM_MMC=y and device tree support.
>
> While at it, add more DM drivers, so that it becomes closer to
> mx6slevk_defconfig.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>

Could you also please consider this one for the upcoming 2017.11 release?

Thanks
Stefano Babic Oct. 31, 2017, 10:05 a.m. UTC | #2 
Hi Fabio,

On 30/10/2017 23:42, Fabio Estevam wrote:
> Hi Stefano,
> 
> On Fri, Oct 13, 2017 at 10:27 AM, Fabio Estevam <festevam@gmail.com> wrote:
>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>
>> Commit 001cdbbb32ef1f6 ("imx: mx6slevk: enable more DM drivers") breaks
>> MMC support in U-Boot proper on the mx6slevk_spl_defconfig target:
>>
>> U-Boot SPL 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18)
>> Trying to boot from MMC1
>>
>> U-Boot 2017.09-00396-g6ca43a5 (Oct 01 2017 - 16:20:18 -0300)
>>
>> CPU:   Freescale i.MX6SL rev1.0 792 MHz (running at 396 MHz)
>> CPU:   Commercial temperature grade (0C to 95C) at 33C
>> Reset cause: POR
>> Board: MX6SLEVK
>> I2C:   ready
>> DRAM:  1 GiB
>> MMC:   FSL_SDHC: 0
>> MMC Device 1 not found
>> *** Warning - No MMC card found, using default environment
>>
>> As mx6slevk_spl_defconfig does not use CONFIG_DM_MMC and its
>> board file does not register the mmc controller for U-Boot proper,
>> let's fix this by adding CONFIG_DM_MMC=y and device tree support.
>>
>> While at it, add more DM drivers, so that it becomes closer to
>> mx6slevk_defconfig.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Could you also please consider this one for the upcoming 2017.11 release?
> 

Thought Peng wanted to post a V3 together with USB cleanup - I'll pick
up both, thanks for hint !

Stefano
diff mbox series

Patch

diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig
index 689fe79..05a5c9e 100644
--- a/configs/mx6slevk_spl_defconfig
+++ b/configs/mx6slevk_spl_defconfig
@@ -9,7 +9,8 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6SL,SYS_I2C"
+CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6SL"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
@@ -32,13 +33,26 @@  CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y