[U-Boot] [PATCH V2 1/2] imx: spl: enable CONFIG_SPL_WATCHDOG_SUPPORT

This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Signed-off-by: Peng Fan peng.fan@nxp.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@freescale.com Cc: Marek Vasut marex@denx.de Cc: Tim Harvey tharvey@gateworks.com --- include/configs/imx6_spl.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 43ce7fe..68d3fd7 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -34,6 +34,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_SPL_WATCHDOG_SUPPORT
/* NAND support */ #if defined(CONFIG_SPL_NAND_SUPPORT)

With DEBUG macro enabled, SPL build failure: " arch/arm/cpu/armv7/built-in.o: In function `reset_misc': ~/uboot/arch/arm/cpu/armv7/mx6/soc.c:406: undefined reference to `lcdif_power_down' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Wrap VIDEO settings with ifndef CONFIG_SPL_BUILD
Signed-off-by: Peng Fan peng.fan@nxp.com Reviewed-by: Stefano Babic sbabic@denx.de --- include/configs/mx6ul_14x14_evk.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 5779632..a4f624c 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -243,6 +243,7 @@
#define CONFIG_IMX_THERMAL
+#ifndef CONFIG_SPL_BUILD #define CONFIG_VIDEO #ifdef CONFIG_VIDEO #define CONFIG_CFB_CONSOLE @@ -259,5 +260,6 @@ #define CONFIG_VIDEO_BMP_LOGO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #endif +#endif
#endif

Hi Peng,
On 01/04/2016 05:27 AM, Peng Fan wrote:
This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Signed-off-by: Peng Fan peng.fan@nxp.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@freescale.com Cc: Marek Vasut marex@denx.de Cc: Tim Harvey tharvey@gateworks.com
include/configs/imx6_spl.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 43ce7fe..68d3fd7 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -34,6 +34,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_SPL_WATCHDOG_SUPPORT
I've been carrying a local patch for the same, so
Acked-by: Eric Nelson eric@nelint.com

On Monday, January 04, 2016 at 01:27:27 PM, Peng Fan wrote:
This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Why don't you implement dummy reset_cpu() {} instead ?
Signed-off-by: Peng Fan peng.fan@nxp.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@freescale.com Cc: Marek Vasut marex@denx.de Cc: Tim Harvey tharvey@gateworks.com
include/configs/imx6_spl.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 43ce7fe..68d3fd7 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -34,6 +34,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_SPL_WATCHDOG_SUPPORT
/* NAND support */ #if defined(CONFIG_SPL_NAND_SUPPORT)
Best regards, Marek Vasut

Hi Marek, On Mon, Jan 04, 2016 at 01:38:23PM +0100, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:27:27 PM, Peng Fan wrote:
This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Why don't you implement dummy reset_cpu() {} instead ?
Do you mean this, https://patchwork.ozlabs.org/patch/562232/?
Regards, Peng
Signed-off-by: Peng Fan peng.fan@nxp.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@freescale.com Cc: Marek Vasut marex@denx.de Cc: Tim Harvey tharvey@gateworks.com
include/configs/imx6_spl.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 43ce7fe..68d3fd7 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -34,6 +34,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_SPL_WATCHDOG_SUPPORT
/* NAND support */ #if defined(CONFIG_SPL_NAND_SUPPORT)
Best regards, Marek Vasut

On Monday, January 04, 2016 at 01:40:10 PM, Peng Fan wrote:
Hi Marek,
On Mon, Jan 04, 2016 at 01:38:23PM +0100, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:27:27 PM, Peng Fan wrote:
This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Why don't you implement dummy reset_cpu() {} instead ?
Do you mean this, https://patchwork.ozlabs.org/patch/562232/?
Yes, I'd prefer that, since I do not want to see watchdog support becoming mandatory part of the SPL build. Watchdog support should be optional.
Best regards, Marek Vasut

On Mon, Jan 04, 2016 at 01:45:49PM +0100, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:40:10 PM, Peng Fan wrote:
Hi Marek,
On Mon, Jan 04, 2016 at 01:38:23PM +0100, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:27:27 PM, Peng Fan wrote:
This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Why don't you implement dummy reset_cpu() {} instead ?
Do you mean this, https://patchwork.ozlabs.org/patch/562232/?
Yes, I'd prefer that, since I do not want to see watchdog support becoming mandatory part of the SPL build. Watchdog support should be optional.
Wait for Stefano's comments on this -:)
Regards, Peng.
Best regards, Marek Vasut

Hi Marek, Peng,
On 04/01/2016 13:45, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:40:10 PM, Peng Fan wrote:
Hi Marek,
On Mon, Jan 04, 2016 at 01:38:23PM +0100, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:27:27 PM, Peng Fan wrote:
This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Why don't you implement dummy reset_cpu() {} instead ?
Do you mean this, https://patchwork.ozlabs.org/patch/562232/?
Yes, I'd prefer that, since I do not want to see watchdog support becoming mandatory part of the SPL build. Watchdog support should be optional.
Yes, enabling watchdog should be not be mandatory. Anyway, this happens only if CONFIG_IMX_WATCHDOG is set, else CONFIG_SPL_WATCHDOG_SUPPORT lets only to link reset_cpu() to the build. This is also what happens for all MX6 boards that do not enable the watchdog but need reset_cpu().
Adding another dummy function looks nasty to me, and Fabio sent some time ago patches to clean up this and drop empty reset_cpu() inside board files. We should not create this mess again.
Best regards, Stefano Babic

On Monday, January 04, 2016 at 01:57:59 PM, Stefano Babic wrote:
Hi Marek, Peng,
On 04/01/2016 13:45, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:40:10 PM, Peng Fan wrote:
Hi Marek,
On Mon, Jan 04, 2016 at 01:38:23PM +0100, Marek Vasut wrote:
On Monday, January 04, 2016 at 01:27:27 PM, Peng Fan wrote:
This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined.
" arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue.
Why don't you implement dummy reset_cpu() {} instead ?
Do you mean this, https://patchwork.ozlabs.org/patch/562232/?
Yes, I'd prefer that, since I do not want to see watchdog support becoming mandatory part of the SPL build. Watchdog support should be optional.
Yes, enabling watchdog should be not be mandatory. Anyway, this happens only if CONFIG_IMX_WATCHDOG is set, else CONFIG_SPL_WATCHDOG_SUPPORT lets only to link reset_cpu() to the build.
This is completely counter-intuitive and stupid. I suspect this behavior is required on iMX because iMXes reset through watchdog, yes ? In that case, add a comment explaining why we always select watchdog in SPL on i.MXes.
This is also what happens for all MX6 boards that do not enable the watchdog but need reset_cpu().
Adding another dummy function looks nasty to me, and Fabio sent some time ago patches to clean up this and drop empty reset_cpu() inside board files. We should not create this mess again.
Fine
Best regards, Marek Vasut
participants (4)
-
Eric Nelson
-
Marek Vasut
-
Peng Fan
-
Stefano Babic