Hi Tom, On Tue, 14 Feb 2023 at 09:43, Tom Rini <[email protected]> wrote: > > On Tue, Feb 14, 2023 at 11:34:47AM -0500, Tom Rini wrote: > > 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 <[email protected]> > > > --- > > > > > > (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. > > Or perhaps, the same question as in the socfpga patch also applies here.
Yes and with a similar answer. By using PPL_WATCHDOG we ensure that the code is enabled in SPL as well as PPL. I am not sure what the plan is for getting rid of the old watchdog stuff. +Stefan Roese for that Regards, Simon
