[PATCH 1/2] startup: don't skip countdown if consoles were runtime enabled

[Sascha Hauer]

On Thu, Sep 21, 2023 at 11:25:38AM +0200, Ahmad Fatoum wrote:
> Systems with verified boot will disable at least console input by
> default, but when presented with an unlock token, they may elect to
> enable the console. Currently, the user needs to be really quick with
> ctrl+c to abort the boot on the active console, so let's make the system
> have a normal count down if a console has been activated by board code.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
> ---
>  common/startup.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/common/startup.c b/common/startup.c
> index f96cff41429d..bbba72f89255 100644
> --- a/common/startup.c
> +++ b/common/startup.c
> @@ -174,7 +174,7 @@ enum autoboot_state do_autoboot_countdown(void)
>  	if (autoboot_state != AUTOBOOT_UNKNOWN)
>  		return autoboot_state;
>  
> -	if (IS_ENABLED(CONFIG_CONSOLE_DISABLE_INPUT)) {
> +	if (!console_get_first_active()) {
>  		printf("\nNon-interactive console, booting system\n");
>  		return autoboot_state = AUTOBOOT_BOOT;
>  	}
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |