diff options
author | Christophe Leroy <christophe.leroy@c-s.fr> | 2018-03-16 19:20:59 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-04-06 23:30:37 +0300 |
commit | 5c5da4318b18b7144975c9d93cbde1b981ed4e56 (patch) | |
tree | 184ae67e60554ab1ae3b2e5885c088f6084de9c8 /include | |
parent | ab0d8192583a725f992279fe895653a146509bdc (diff) | |
download | u-boot-5c5da4318b18b7144975c9d93cbde1b981ed4e56.tar.xz |
powerpc: mpc8xx: cleaning up watchdog
In preparation of migration to DM watchdog, clean up a bit.
The 8xx watchdog really is a HW watchdog, so declare it as is
then it goes through Kconfig
And the watchdog reset doesn't mind getting interrupted, so
no need to disable interrupts
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/MCR3000.h | 2 | ||||
-rw-r--r-- | include/watchdog.h | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index cb28d6522a..aeda4742aa 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -60,8 +60,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ -#define CONFIG_WATCHDOG 1 /* watchdog enabled */ - /* Miscellaneous configurable options */ #define CONFIG_SYS_MEMTEST_START 0x00002000 diff --git a/include/watchdog.h b/include/watchdog.h index d420ab127b..52f4c506b0 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -72,11 +72,6 @@ int init_func_watchdog_reset(void); * Prototypes from $(CPU)/cpu.c. */ -/* MPC 8xx */ -#if defined(CONFIG_MPC8xx) && !defined(__ASSEMBLY__) - void reset_8xx_watchdog(immap_t __iomem *immr); -#endif - #if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__) void hw_watchdog_init(void); #endif |