Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 08:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2020-02-28-mpc8xx-fixes'

Browse source 
- Fix the watchdog on mpc8xx platforms
This commit is contained in:
Tom Rini 2020-02-28 11:04:50 -05:00
commit 783b6a7173
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/cpu/mpc8xx/Kconfig
View file

@ -25,10 +25,6 @@ config MPC885
endchoice endchoice
#config MPC8xx_WATCHDOG
# bool "Watchdog"
# select HW_WATCHDOG
config 8xx_GCLK_FREQ config 8xx_GCLK_FREQ
int "CPU GCLK Frequency" int "CPU GCLK Frequency"

3
drivers/watchdog/Kconfig
View file

@ -2,6 +2,7 @@ menu "Watchdog Timer Support"
config WATCHDOG config WATCHDOG
bool "Enable U-Boot watchdog reset" bool "Enable U-Boot watchdog reset"
depends on !HW_WATCHDOG
help help
This option enables U-Boot watchdog support where U-Boot is using This option enables U-Boot watchdog support where U-Boot is using
watchdog_reset function to service watchdog device in U-Boot. Enable watchdog_reset function to service watchdog device in U-Boot. Enable
@ -118,7 +119,7 @@ config WDT_CORTINA
config WDT_MPC8xx config WDT_MPC8xx
bool "MPC8xx watchdog timer support" bool "MPC8xx watchdog timer support"
depends on WDT && MPC8xx depends on WDT && MPC8xx
select CONFIG_MPC8xx_WATCHDOG select HW_WATCHDOG
help help
Select this to enable mpc8xx watchdog timer Select this to enable mpc8xx watchdog timer

2
drivers/watchdog/mpc8xx_wdt.c
View file

@ -10,7 +10,7 @@
#include <asm/cpm_8xx.h> #include <asm/cpm_8xx.h>
#include <asm/io.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; immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;