[PATCH v3 52/81] omap: Correct an SPL build error with watchdog

Simon Glass sjg at chromium.org
Mon Feb 6 20:05:20 CET 2023

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

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)
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 #ifdef CONFIG_AM33XX

More information about the U-Boot mailing list