diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-01 02:11:15 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-01 02:11:15 +0300 |
| commit | e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a (patch) | |
| tree | a7f70892693eb02a9e23529c8ded4aea98af64a1 /board | |
| parent | df6cf3d809fe543651e6bdf133baaa8b9841fe0f (diff) | |
| parent | 4171c574721f3790b416b57d6a536cf3238d5849 (diff) | |
| download | u-boot-e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a.tar.xz | |
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into next
- Handling all DM watchdogs in watchdog_reset() (Rasmus)
Diffstat (limited to 'board')
| -rw-r--r-- | board/alliedtelesis/x530/x530.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c index 7bcfa828d7..8b31045a07 100644 --- a/board/alliedtelesis/x530/x530.c +++ b/board/alliedtelesis/x530/x530.c @@ -121,9 +121,8 @@ int board_init(void) void arch_preboot_os(void) { -#ifdef CONFIG_WATCHDOG - wdt_stop(gd->watchdog_dev); -#endif + if (CONFIG_IS_ENABLED(WDT)) + wdt_stop_all(); } static int led_7seg_init(unsigned int segments) |