[PATCH 2/8] common: efi: do not use undefined kconfig option

[Lucas Stach]

Am Mittwoch, den 05.07.2017, 12:56 +0200 schrieb Steffen Trumtrar:
> Signed-off-by: Steffen Trumtrar <s.trumtrar at pengutronix.de>
> ---
>  common/efi/efi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/common/efi/efi.c b/common/efi/efi.c
> index 05c58250f4a7..f924385958e1 100644
> --- a/common/efi/efi.c
> +++ b/common/efi/efi.c
> @@ -266,8 +266,7 @@ static int efi_console_init(void)
>  
>  	add_generic_device("efi-stdio", DEVICE_ID_SINGLE, NULL, 0 , 0, 0, NULL);
>  
> -	if (IS_ENABLED(CONFIG_ARCH_EFI_REGISTER_COM1))

It seems we lost this option when moving arch/efi to arch/x86. As
unconditionally enabling the serial console may break some boards, the
proper fix should be to bring back the Kconfig option.

> -		add_ns16550_device(0, 0x3f8, 0x10, IORESOURCE_IO | IORESOURCE_MEM_8BIT,
> +	add_ns16550_device(0, 0x3f8, 0x10, IORESOURCE_IO | IORESOURCE_MEM_8BIT,
>  				&ns16550_plat);
>  
>  	return 0;