Skip to contentSkip to conversation

colibri_imx6: fix broken fsl_esdhc_imx conversion

PATCH RESEND New Igor Opaniuk 6 participants 7 messages Dec 6, 2019 – Dec 28, 2019 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion

From: Igor Opaniuk <[email protected]>

Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs.

U-boot is stuck after this message:
Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1

Fixes e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")

---

 board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +2 -2
index ad40b589c1..44173dde1f 100644
@@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = {
 	MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Colibri MMC */
 iomux_v3_cfg_t const usdhc1_pads[] = {
 	MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
 	{USDHC3_BASE_ADDR},
Signature · 1 line
2.17.1
#1 lore raw

PATCH RESEND 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion

Hi Stefano

Quoted 41 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs.

U-boot is stuck after this message:
Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1

Fixes e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")

---

 board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/toradex/colibri_imx6/colibri_imx6.c +2 -3
index ad40b589c1..44173dde1f 100644
@@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = {
        MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Colibri MMC */
 iomux_v3_cfg_t const usdhc1_pads[] = {
        MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
        {USDHC3_BASE_ADDR},
--
Quoted 2 lines

2.17.1

I've just found the same fix [1] but from Ricardo with Awaiting upstream status in patchwork (I thought that he has fixed just Apalis iMX6), but seems the patch was
lost somewhere, as I can not find it nor in u-boot-imx/next neither in u-boot-imx/master branches.

[1] https://patchwork.ozlabs.org/patch/1157059/

Signature · 8 lines
Best regards - Freundliche Grüsse - Meilleures salutations

Senior Development Engineer,
Igor Opaniuk

Toradex AG
Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500 48
00 (main line)
#2 lore raw

PATCH RESEND 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion

Hi Igor,

Quoted 39 lines

Hi Stefano

Quoted 35 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs.

U-boot is stuck after this message:
Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1

Fixes e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")

---

 board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/board/toradex/colibri_imx6/colibri_imx6.c index ad40b589c1..44173dde1f 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), };

board/toradex/colibri_imx6/colibri_imx6.c +1 -1
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Colibri MMC */
 iomux_v3_cfg_t const usdhc1_pads[] = {
        MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
Quoted 14 lines
Quoted 8 lines
board/toradex/colibri_imx6/colibri_imx6.c +1 -2
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
        {USDHC3_BASE_ADDR},
--

2.17.1

I've just found the same fix [1] but from Ricardo with Awaiting upstream status in patchwork (I thought that he has fixed just Apalis iMX6), but seems the patch was
lost somewhere, as I can not find it nor in u-boot-imx/next neither in u-boot-imx/master branches.

Thanks for providing the fix (at least for the Toradex boards)

And I do guess that more i.MX6 boards are affected ...

Quoted 3 lines

[1] https://patchwork.ozlabs.org/patch/1157059/

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191206/34477b39/attachment.sig>

#3 lore raw

PATCH RESEND 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion

Quoted 56 lines · Lukasz Majewski

Hi Igor,

Quoted 39 lines

Hi Stefano

Quoted 35 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs.

U-boot is stuck after this message:
Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1

Fixes e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")

---

 board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/board/toradex/colibri_imx6/colibri_imx6.c index ad40b589c1..44173dde1f 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), };

board/toradex/colibri_imx6/colibri_imx6.c +1 -1
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Colibri MMC */
 iomux_v3_cfg_t const usdhc1_pads[] = {
        MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
Quoted 14 lines
Quoted 8 lines
board/toradex/colibri_imx6/colibri_imx6.c +1 -2
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
        {USDHC3_BASE_ADDR},
--

2.17.1

I've just found the same fix [1] but from Ricardo with Awaiting upstream status in patchwork (I thought that he has fixed just Apalis iMX6), but seems the patch was
lost somewhere, as I can not find it nor in u-boot-imx/next neither in u-boot-imx/master branches.

Quoted 3 lines

Thanks for providing the fix (at least for the Toradex boards)

And I do guess that more i.MX6 boards are affected ...

I think there's just one other. The imx8qm_rom7720_a1 references CONFIG_FSL_ESDHC still, but I don't see any other i.MX8 platforms doing anything with the symbol to compare with.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191206/9b1d842c/attachment.sig>
#4 lore raw

PATCH RESEND 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion

Quoted 57 lines · Tom Rini
Quoted 56 lines · Lukasz Majewski

Hi Igor,

Quoted 53 lines

Hi Stefano

Quoted 41 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs.

U-boot is stuck after this message:
Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1

Fixes e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")

---

 board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/board/toradex/colibri_imx6/colibri_imx6.c index ad40b589c1..44173dde1f 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), };

board/toradex/colibri_imx6/colibri_imx6.c +2 -3
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Colibri MMC */
 iomux_v3_cfg_t const usdhc1_pads[] = {
        MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
        {USDHC3_BASE_ADDR},
--
Quoted 2 lines

2.17.1

I've just found the same fix [1] but from Ricardo with Awaiting upstream status in patchwork (I thought that he has fixed just Apalis iMX6), but seems the patch was
lost somewhere, as I can not find it nor in u-boot-imx/next neither in u-boot-imx/master branches.

Quoted 7 lines
Quoted 3 lines

Thanks for providing the fix (at least for the Toradex boards)

And I do guess that more i.MX6 boards are affected ...

I think there's just one other. The imx8qm_rom7720_a1 references CONFIG_FSL_ESDHC still, but I don't see any other i.MX8 platforms doing anything with the symbol to compare with.

thx for that hint, so I must replace CONFIG_FSL_ESDHC with CONFIG_FSL_ESDHC_IMX in board/advantech/imx8qm_rom7720_a1/spl.c ?

Best regards,

Oliver

#5 lore raw

PATCH RESEND 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion

Quoted 60 lines · Oliver Graute
Quoted 59 lines · Tom Rini
Quoted 58 lines · Lukasz Majewski

Hi Igor,

Quoted 39 lines

Hi Stefano

Quoted 35 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs.

U-boot is stuck after this message:
Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1

Fixes e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")

---

 board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/board/toradex/colibri_imx6/colibri_imx6.c index ad40b589c1..44173dde1f 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), };

board/toradex/colibri_imx6/colibri_imx6.c +1 -1
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Colibri MMC */
 iomux_v3_cfg_t const usdhc1_pads[] = {
        MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
Quoted 14 lines
Quoted 8 lines
board/toradex/colibri_imx6/colibri_imx6.c +1 -2
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
        {USDHC3_BASE_ADDR},
--

2.17.1

I've just found the same fix [1] but from Ricardo with Awaiting upstream status in patchwork (I thought that he has fixed just Apalis iMX6), but seems the patch was
lost somewhere, as I can not find it nor in u-boot-imx/next neither in u-boot-imx/master branches.

Thanks for providing the fix (at least for the Toradex boards)

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

And I do guess that more i.MX6 boards are affected ...

I think there's just one other. The imx8qm_rom7720_a1 references CONFIG_FSL_ESDHC still, but I don't see any other i.MX8 platforms doing anything with the symbol to compare with.

thx for that hint, so I must replace CONFIG_FSL_ESDHC with CONFIG_FSL_ESDHC_IMX in board/advantech/imx8qm_rom7720_a1/spl.c ?

Yes, and confirm that everything works as expected for the appropriate use cases. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191209/1965ff24/attachment.sig>
#6 lore raw

PATCH RESEND 1/1 colibri_imx6: fix broken fsl_esdhc_imx conversion

In reply to Igor Opaniuk
Quoted 9 lines

From: Igor Opaniuk <[email protected]>
Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs.
U-boot is stuck after this message:
Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1

Fixes e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================