diff options
| author | Tom Rini <[email protected]> | 2019-04-26 13:50:00 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-04-26 13:50:00 -0400 |
| commit | 07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f (patch) | |
| tree | f9b57804a3f3c57efcb5a17c836396b3b04dbf5f /common | |
| parent | 1c64692df20c1f491ea79de3a732428611bb0ba0 (diff) | |
| parent | b684d4031b38b6b6a9e22676c7c6e2770e767cc7 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Add DM based generic watchdog start and reset implementation
and remove all ad-hoc implementations (Stefan)
- Move mv_sdhci to DM (Pierre)
- Misc turris_omnia updates (Pierre)
- Change openrd targets to correctly build again (size changes
and fixes to the dts targets) and bring it back into Travis
builds (Stefan)
- Add Kirkwood db-88f6281-bp board (Chris)
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 4 | ||||
| -rw-r--r-- | common/spl/spl.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c index 1ad44bbe3f7..150e8cd424f 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -48,6 +48,7 @@ #include <linux/compiler.h> #include <linux/err.h> #include <efi_loader.h> +#include <wdt.h> DECLARE_GLOBAL_DATA_PTR; @@ -677,6 +678,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_DM initr_dm, #endif +#if defined(CONFIG_WDT) + initr_watchdog, +#endif #if defined(CONFIG_ARM) || defined(CONFIG_NDS32) || defined(CONFIG_RISCV) || \ defined(CONFIG_SANDBOX) board_init, /* Setup chipselects */ diff --git a/common/spl/spl.c b/common/spl/spl.c index 88d4b8a9bf1..0a6a47c2020 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -22,6 +22,7 @@ #include <linux/compiler.h> #include <fdt_support.h> #include <bootcount.h> +#include <wdt.h> DECLARE_GLOBAL_DATA_PTR; @@ -600,6 +601,10 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_board_init(); #endif +#if defined(CONFIG_SPL_WATCHDOG_SUPPORT) && defined(CONFIG_WDT) + initr_watchdog(); +#endif + if (IS_ENABLED(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF)) dram_init_banksize(); |