diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2021-08-19 11:57:02 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2021-08-31 12:04:03 +0200 |
| commit | 1c5aedcd9ac419199983e5e0ef398170843f6976 (patch) | |
| tree | 5fd9185670d56a503e3275401522555ff9959bc5 | |
| parent | 90555dc83e886250f029711728939a219c225f2d (diff) | |
| download | u-boot-1c5aedcd9ac419199983e5e0ef398170843f6976.tar.gz | |
board: x530: switch to wdt_stop_all()
Since the gd->watchdog_dev member is going away, switch to using the
new wdt_stop_all() helper.
While here, clean up the preprocessor conditional: The ->watchdog_dev
member is actually guarded by CONFIG_WDT [disabling that in
x530_defconfig while keeping CONFIG_WATCHDOG breaks the build], and in
the new world order so is the existence of the wdt_stop_all()
function.
Actually, existence of wdt_stop_all() depends on CONFIG_${SPL_}WDT, so
really spell the condition using CONFIG_IS_ENABLED, and make it a C
rather than cpp if.
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
| -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) |