Skip to contentSkip to conversation

imx: mx6: Fix implementantion reset_misc

PATCH New Michael Trimarchi 4 participants 4 messages Jun 20, 2018 – Jul 23, 2018

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Michael Trimarchi

author
#0 lore raw

PATCH 1/1 imx: mx6: Fix implementantion reset_misc

lcdif_power_down should not be included in spl build to avoid build failure introduced by commit eb111bb31d882877e75e6b8083808dcaf6493b92

Signed-off-by Michael Trimarchi <[email protected]>
---
 arch/arm/mach-imx/mx6/soc.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-imx/mx6/soc.c +2 -0
index e8b6f77..ffc2951 100644
@@ -548,9 +548,11 @@ const struct boot_mode soc_boot_modes[] = {
 
 void reset_misc(void)
 {
+#ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO_MXS
 	lcdif_power_down();
 #endif
+#endif
 }
 
 void s_init(void)
Signature · 1 line
2.7.4
reviewer
#1 lore raw

PATCH 1/1 imx: mx6: Fix implementantion reset_misc

There is typo in the Subject: "implementation"

Quoted 2 lines · Michael Trimarchi

lcdif_power_down should not be included in spl build to avoid build failure introduced by commit eb111bb31d882877e75e6b8083808dcaf6493b92

What is the build failure exactly?

Please specify the commit as eb111bb31d88 ("imx: mx6: implement reset_misc")

Quoted 10 lines
Signed-off-by Michael Trimarchi <[email protected]>
---
 arch/arm/mach-imx/mx6/soc.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-imx/mx6/soc.c +0 -0
index e8b6f77..ffc2951 100644

arch/arm/mach-imx/mx6/soc.c const struct boot_mode soc_boot_modes[] = { · line 555

Quoted 8 lines
arch/arm/mach-imx/mx6/soc.c +2 -0
@@ -548,9 +548,11 @@ const struct boot_mode soc_boot_modes[] = {
 
 void reset_misc(void)
 {
+#ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO_MXS
        lcdif_power_down();
 #endif
+#endif

Yes, we don't need LCD related functions in SPL, so this fix looks good.

#2 lore raw

PATCH 1/1 imx: mx6: Fix implementantion reset_misc

In reply to Michael Trimarchi
Quoted 24 lines

-----Original Message-----
From: Michael Trimarchi [mailto:michael at amarulasolutions.com]
Sent: 2018年6月21日 5:28
To: Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>; Albert Aribaud <[email protected]>; Peng Fan <[email protected]>; Sébastien Szymanski <[email protected]>; u-boot at lists.denx.de
Subject: [PATCH] imx: mx6: Fix implementantion reset_misc

lcdif_power_down should not be included in spl build to avoid build failure introduced by commit eb111bb31d882877e75e6b8083808dcaf6493b92

Signed-off-by Michael Trimarchi <[email protected]>
---
 arch/arm/mach-imx/mx6/soc.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-imx/mx6/soc.c +0 -0
index e8b6f77..ffc2951 100644

arch/arm/mach-imx/mx6/soc.c const struct boot_mode soc_boot_modes[] = { · line 555

Quoted 8 lines
arch/arm/mach-imx/mx6/soc.c +2 -0
@@ -548,9 +548,11 @@ const struct boot_mode soc_boot_modes[] = {
 
 void reset_misc(void)
 {
+#ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO_MXS
 	lcdif_power_down();
 #endif
+#endif
Reviewed-by Peng Fan <[email protected]>
Quoted 5 lines
arch/arm/mach-imx/mx6/soc.c +0 -1
 }
 
 void s_init(void)
--

2.7.4

#3 lore raw

PATCH 1/1 imx: mx6: Fix implementantion reset_misc

In reply to Michael Trimarchi
Quoted 15 lines · Michael Trimarchi

lcdif_power_down should not be included in spl build to avoid build failure introduced by commit eb111bb31d882877e75e6b8083808dcaf6493b92

Signed-off-by Michael Trimarchi <[email protected]>
---
 arch/arm/mach-imx/mx6/soc.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-imx/mx6/soc.c +0 -0
index e8b6f77..ffc2951 100644
@@ -548,9 +548,11 @@ const struct boot_mode soc_boot_modes[] = {

arch/arm/mach-imx/mx6/soc.c const struct boot_mode soc_boot_modes[] = { · line 558

Quoted 10 lines
arch/arm/mach-imx/mx6/soc.c +2 -0
 void reset_misc(void)
 {
+#ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_VIDEO_MXS
 	lcdif_power_down();
 #endif
+#endif
 }
 
 void s_init(void)

Applied to u-boot-imx, 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
=====================================================================