[PATCH v3 65/95] omap: Correct an SPL build error with watchdog

[Tom Rini]

On Sun, Feb 12, 2023 at 04:16:08PM -0700, Simon Glass wrote:
> The logic here is strange since the call to hw_watchdog_init() depends on
> CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG but the code it calls is only
> enabled if !CONFIG_IS_ENABLED(WDT). This seems to work, but with split
> config we get a build error in SPL with CONFIG_WATCHDOG, since it is
> interpreted as CONFIG_SPL_WATCHDOG.
> 
> To mimic the behaviour before split config takes effect, use the
> PPL_WATCHDOG symbol.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
> (no changes since v1)
> 
>  arch/arm/mach-omap2/boot-common.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
> index 9a342a1bf95..401d12c6ca3 100644
> --- a/arch/arm/mach-omap2/boot-common.c
> +++ b/arch/arm/mach-omap2/boot-common.c
> @@ -302,7 +302,7 @@ void spl_board_init(void)
>  #if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW)
>  	arch_misc_init();
>  #endif
> -#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
> +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_PPL_WATCHDOG)
>  	hw_watchdog_init();
>  #endif
>  #ifdef CONFIG_AM33XX

No, we want watchdog enabled in SPL.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20230214/99512c32/attachment.sig>