[PATCHv2 22/31] arm: toradex: Convert CONFIG_CONSOLE_MUX to Kconfig

[Igor Opaniuk]

Hi Tom,

On Wed, Jun 17, 2020, 02:12 Tom Rini <trini at konsulko.com> wrote:

> This converts the following to Kconfig:
>    CONFIG_CONSOLE_MUX
>
> Cc: Igor Opaniuk <igor.opaniuk at toradex.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
>  configs/apalis_imx6_defconfig  | 2 --
>  configs/colibri_imx6_defconfig | 2 --
>  include/configs/apalis_imx6.h  | 1 -
>  include/configs/colibri_imx6.h | 1 -
>  4 files changed, 6 deletions(-)
>
> diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
> index 6b0f0e463896..e9d9b3f30239 100644
> --- a/configs/apalis_imx6_defconfig
> +++ b/configs/apalis_imx6_defconfig
> @@ -19,8 +19,6 @@ CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
>  CONFIG_BOOTDELAY=1
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_MISC_INIT_R=y
>  CONFIG_VERSION_VARIABLE=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/colibri_imx6_defconfig
> b/configs/colibri_imx6_defconfig
> index 44a3ff859c2d..8bdae00129c3 100644
> --- a/configs/colibri_imx6_defconfig
> +++ b/configs/colibri_imx6_defconfig
> @@ -18,8 +18,6 @@ CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
>  CONFIG_BOOTDELAY=1
> -# CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_MISC_INIT_R=y
>  CONFIG_VERSION_VARIABLE=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
> index d5a0625e0282..b2d87019c8e7 100644
> --- a/include/configs/apalis_imx6.h
> +++ b/include/configs/apalis_imx6.h
> @@ -74,7 +74,6 @@
>  #define CONFIG_BMP_16BPP
>  #define CONFIG_VIDEO_LOGO
>  #define CONFIG_VIDEO_BMP_LOGO
> -#define CONFIG_CONSOLE_MUX
>  #define CONFIG_IMX_HDMI
>  #define CONFIG_IMX_VIDEO_SKIP
>
> diff --git a/include/configs/colibri_imx6.h
> b/include/configs/colibri_imx6.h
> index 6beef250942b..a0ee4d48ad06 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -62,7 +62,6 @@
>  #define CONFIG_BMP_16BPP
>  #define CONFIG_VIDEO_LOGO
>  #define CONFIG_VIDEO_BMP_LOGO
> -#define CONFIG_CONSOLE_MUX
>  #define CONFIG_IMX_HDMI
>  #define CONFIG_IMX_VIDEO_SKIP
>
> --
> 2.17.1
>

Reviewed-by: Igor Opaniuk <igor.opaniuk at toradex.com>

>