diff options
| author | Mark Langsdorf <mark.langsdorf@calxeda.com> | 2013-09-10 15:20:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-08 15:25:14 -0500 |
| commit | 00ddacc1a1860bf777ba32ac0ece7a566c97bf48 (patch) | |
| tree | 0bdeb7527cafaacaf566a0b799561fa5fd90de33 /common | |
| parent | 212d7dadcd6465d342b937bf095114c0a8ced048 (diff) | |
| download | u-boot-00ddacc1a1860bf777ba32ac0ece7a566c97bf48.tar.gz u-boot-00ddacc1a1860bf777ba32ac0ece7a566c97bf48.tar.bz2 u-boot-00ddacc1a1860bf777ba32ac0ece7a566c97bf48.zip | |
autoboot: add an option to override keyed autoboot
As originally implemented, setting the AUTOBOOT_KEYED config option will
prevent users from breaking into the autoboot script with ctrl-c. Restore
that option with a new config symbol.
Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c index 6f475f0cca..8b6f274fa2 100644 --- a/common/main.c +++ b/common/main.c @@ -392,13 +392,13 @@ static void process_boot_delay(void) debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>"); if (bootdelay != -1 && s && !abortboot(bootdelay)) { -#ifdef CONFIG_AUTOBOOT_KEYED +#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC) int prev = disable_ctrlc(1); /* disable Control C checking */ #endif run_command_list(s, -1, 0); -#ifdef CONFIG_AUTOBOOT_KEYED +#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC) disable_ctrlc(prev); /* restore Control C checking */ #endif } |