| Message ID | 1529530074-29620-1-git-send-email-michael@amarulasolutions.com |
|---|---|
| State | Accepted |
| Commit | 9236269de57dc1bd6574855a2d07721f49e80be8 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot] imx: mx6: Fix implementantion reset_misc | expand |
There is typo in the Subject: "implementation" On Wed, Jun 20, 2018 at 6:27 PM, Michael Trimarchi <michael@amarulasolutions.com> wrote: > 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") > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > --- > arch/arm/mach-imx/mx6/soc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c > index e8b6f77..ffc2951 100644 > --- a/arch/arm/mach-imx/mx6/soc.c > +++ b/arch/arm/mach-imx/mx6/soc.c > @@ -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.
> -----Original Message----- > From: Michael Trimarchi [mailto:michael@amarulasolutions.com] > Sent: 2018年6月21日 5:28 > To: Stefano Babic <sbabic@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com>; Albert Aribaud > <albert.u.boot@aribaud.net>; Peng Fan <peng.fan@nxp.com>; Sébastien > Szymanski <sebastien.szymanski@armadeus.com>; u-boot@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 <michael@amarulasolutions.com> > --- > arch/arm/mach-imx/mx6/soc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c > index e8b6f77..ffc2951 100644 > --- a/arch/arm/mach-imx/mx6/soc.c > +++ b/arch/arm/mach-imx/mx6/soc.c > @@ -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 <peng.fan@nxp.com> > } > > void s_init(void) > -- > 2.7.4
On 20/06/2018 23:27, Michael Trimarchi wrote: > lcdif_power_down should not be included in spl build to avoid build > failure introduced by commit eb111bb31d882877e75e6b8083808dcaf6493b92 > > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > --- > arch/arm/mach-imx/mx6/soc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c > index e8b6f77..ffc2951 100644 > --- a/arch/arm/mach-imx/mx6/soc.c > +++ b/arch/arm/mach-imx/mx6/soc.c > @@ -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) > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index e8b6f77..ffc2951 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -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)
lcdif_power_down should not be included in spl build to avoid build failure introduced by commit eb111bb31d882877e75e6b8083808dcaf6493b92 Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> --- arch/arm/mach-imx/mx6/soc.c | 2 ++ 1 file changed, 2 insertions(+)