diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-07-27 21:58:47 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-07-27 21:58:47 +0200 |
| commit | f91f7747879ec28606293426720c136ec15b0e2d (patch) | |
| tree | 883a065bed100b63f4dd1f5e663d9db305ca9c06 /common | |
| parent | 989d3ebf78ad149ee4e9930d7b73ac7370373a28 (diff) | |
| parent | 2863db306e02b14c31dd7ea1fa4857bc3675e42c (diff) | |
| download | barebox-f91f7747879ec28606293426720c136ec15b0e2d.tar.gz barebox-f91f7747879ec28606293426720c136ec15b0e2d.tar.xz | |
Merge branch 'for-next/watchdog'
Diffstat (limited to 'common')
| -rw-r--r-- | common/startup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/startup.c b/common/startup.c index 71a28a7be8..2fed4b71eb 100644 --- a/common/startup.c +++ b/common/startup.c @@ -43,6 +43,7 @@ #include <console_countdown.h> #include <environment.h> #include <linux/ctype.h> +#include <watchdog.h> extern initcall_t __barebox_initcalls_start[], __barebox_early_initcalls_end[], __barebox_initcalls_end[]; @@ -356,6 +357,9 @@ static int run_init(void) if (autoboot == AUTOBOOT_MENU) run_command(MENUFILE); + if (autoboot == AUTOBOOT_ABORT && autoboot == global_autoboot_state) + watchdog_inhibit_all(); + run_shell(); run_command(MENUFILE); |