diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b5e7a8..1fd39a0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -954,7 +954,7 @@
 	select SPL_SEPARATE_BSS if TARGET_SOCFPGA_SOC64
 	select SPL_SERIAL_SUPPORT
 	select SPL_SYSRESET
-	select SPL_WATCHDOG_SUPPORT
+	select SPL_WATCHDOG
 	select SUPPORT_SPL
 	select SYS_NS16550
 	select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index a03eca8..d460268 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -314,7 +314,7 @@
 	select SPL_USB_GADGET if SPL
 	select SPL_USB_HOST_SUPPORT if SPL
 	select SPL_USB_SDP_SUPPORT if SPL
-	select SPL_WATCHDOG_SUPPORT if SPL
+	select SPL_WATCHDOG if SPL
 	select SUPPORT_SPL
 	imply CMD_DM
 
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index e19dbbb..51316b7 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -53,7 +53,7 @@
 	imply SPL_SEPARATE_BSS
 	imply SPL_SERIAL_SUPPORT
 	imply SPL_SYS_MALLOC_SIMPLE
-	imply SPL_WATCHDOG_SUPPORT
+	imply SPL_WATCHDOG
 	imply SPL_YMODEM_SUPPORT
 	help
 	  This option specifies support for the AM335x
@@ -234,7 +234,7 @@
 	imply SPL_NAND_SUPPORT
 	imply SPL_POWER
 	imply SPL_SERIAL_SUPPORT
-	imply SPL_WATCHDOG_SUPPORT
+	imply SPL_WATCHDOG
 	imply SPL_YMODEM_SUPPORT
 	help
 	  This option specifies support for the AM43xx
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index 0e59931..c25ee43 100644
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -17,7 +17,7 @@
 	select SPL_DM_RESET
 	select SPL_SERIAL_SUPPORT
 	select SPL_SYSCON
-	select SPL_WATCHDOG_SUPPORT if WATCHDOG
+	select SPL_WATCHDOG if WATCHDOG
 	imply BOOTSTAGE_STASH if SPL_BOOTSTAGE
 	imply SPL_BOOTSTAGE if BOOTSTAGE
 	imply SPL_DISPLAY_PRINT