diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:05 +0200 |
| commit | 9b1102c02bfd39352e0d2995c733edb7be3b0601 (patch) | |
| tree | 3f089c640bab75c020b69f5dcf44d744a0a7f2e4 /common/startup.c | |
| parent | f48a1596f4e911d4516b986e4778f18321b39b48 (diff) | |
| parent | a10dbfc4175867c0d15f02b7f244837c5d41478e (diff) | |
| download | barebox-9b1102c02bfd39352e0d2995c733edb7be3b0601.tar.gz barebox-9b1102c02bfd39352e0d2995c733edb7be3b0601.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common/startup.c')
| -rw-r--r-- | common/startup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/startup.c b/common/startup.c index 88eeee5e3d..c6e119966a 100644 --- a/common/startup.c +++ b/common/startup.c @@ -202,7 +202,7 @@ void set_autoboot_state(enum autoboot_state autoboot) * do_autoboot_countdown - print autoboot countdown to console * * This prints the autoboot countdown to the console and waits for input. This - * evaluates the global.autoboot_about_key to determine which keys are allowed + * evaluates the global.autoboot_abort_key to determine which keys are allowed * to interrupt booting and also global.autoboot_timeout to determine the timeout * for the counter. This function can be called multiple times, it is executed * only the first time. @@ -314,11 +314,11 @@ static int run_init(void) autoboot = do_autoboot_countdown(); + console_ctrlc_allow(); + if (autoboot == AUTOBOOT_BOOT) run_command("boot"); - console_ctrlc_allow(); - if (autoboot == AUTOBOOT_MENU) run_command(MENUFILE); |