Merge branch '2020-02-28-mpc8xx-fixes'
- Fix the watchdog on mpc8xx platforms
diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig
index 3e8ea38..f112317 100644
--- a/arch/powerpc/cpu/mpc8xx/Kconfig
+++ b/arch/powerpc/cpu/mpc8xx/Kconfig
@@ -25,10 +25,6 @@
endchoice
-#config MPC8xx_WATCHDOG
-# bool "Watchdog"
-# select HW_WATCHDOG
-
config 8xx_GCLK_FREQ
int "CPU GCLK Frequency"
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 36fbdce..d24c1e4 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -2,6 +2,7 @@
config WATCHDOG
bool "Enable U-Boot watchdog reset"
+ depends on !HW_WATCHDOG
help
This option enables U-Boot watchdog support where U-Boot is using
watchdog_reset function to service watchdog device in U-Boot. Enable
@@ -118,7 +119,7 @@
config WDT_MPC8xx
bool "MPC8xx watchdog timer support"
depends on WDT && MPC8xx
- select CONFIG_MPC8xx_WATCHDOG
+ select HW_WATCHDOG
help
Select this to enable mpc8xx watchdog timer
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
index 675b62d..30758ae 100644
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ b/drivers/watchdog/mpc8xx_wdt.c
@@ -10,7 +10,7 @@
#include <asm/cpm_8xx.h>
#include <asm/io.h>
-static void hw_watchdog_reset(void)
+void hw_watchdog_reset(void)
{
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;