summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-06-17 02:06:22 +0300
committerTom Rini <trini@konsulko.com>2020-06-26 17:29:06 +0300
commitbc209fbba5ce226b49fc9d79e8e28acdbff1baca (patch)
tree39b6edb0f0eb5135cec0cf9e6427e964ac23f6ef
parent1ca87f94b23ee21d150a72e6814eee1b1931f959 (diff)
downloadu-boot-bc209fbba5ce226b49fc9d79e8e28acdbff1baca.tar.xz
arm: toradex: Convert CONFIG_CONSOLE_MUX to Kconfig
This converts the following to Kconfig: CONFIG_CONSOLE_MUX Cc: Igor Opaniuk <igor.opaniuk@toradex.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
-rw-r--r--configs/apalis_imx6_defconfig2
-rw-r--r--configs/colibri_imx6_defconfig2
-rw-r--r--include/configs/apalis_imx6.h1
-rw-r--r--include/configs/colibri_imx6.h1
4 files changed, 0 insertions, 6 deletions
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 65162a26f6..bad8a608a2 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 ca33327c6b..e5f8a7356c 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 38d0a6e2e9..80262113e3 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 f5f86f083c..3d3f31369d 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