summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Jourdan <mjourdan@baylibre.com>2018-12-20 15:09:12 +0100
committerNeil Armstrong <narmstrong@baylibre.com>2019-01-31 09:35:01 +0100
commit01790b016ec744ec3b1f13f9fdb24417b3168879 (patch)
tree456739a0686cd7d7e26e50d8090bd2a9432b853c
parentf0d090442bfa73df6b698e70122bd3261f4b2163 (diff)
downloadu-boot-01790b016ec744ec3b1f13f9fdb24417b3168879.tar.gz
arm: meson64: enable console mux and console env by default
With the recent addition of the meson VPU driver, enable the following config entries by default for meson-64 targets: CONFIG_CONSOLE_MUX, CONFIG_SYS_CONSOLE_IS_IN_ENV. This allows outputting the console via video if CONFIG_VIDEO_MESON is selected. Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Anatolij Gustschin <agust@denx.de>
-rw-r--r--configs/khadas-vim2_defconfig2
-rw-r--r--configs/khadas-vim_defconfig2
-rw-r--r--configs/libretech-cc_defconfig2
-rw-r--r--configs/odroid-c2_defconfig2
-rw-r--r--configs/p212_defconfig2
5 files changed, 10 insertions, 0 deletions
diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig
index 75514d2ca5..ed8e32776c 100644
--- a/configs/khadas-vim2_defconfig
+++ b/configs/khadas-vim2_defconfig
@@ -44,3 +44,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y
CONFIG_USB_DWC3=y
CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig
index cf87802653..add8e0973a 100644
--- a/configs/khadas-vim_defconfig
+++ b/configs/khadas-vim_defconfig
@@ -49,3 +49,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y
CONFIG_USB_DWC3=y
CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig
index c21b9ad9ca..c3fdca5e67 100644
--- a/configs/libretech-cc_defconfig
+++ b/configs/libretech-cc_defconfig
@@ -49,3 +49,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y
CONFIG_USB_DWC3=y
CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
index 33e6e74fa2..60cf97b3b6 100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -38,3 +38,5 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_DEBUG_UART_SKIP_INIT=y
CONFIG_MESON_SERIAL=y
CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/p212_defconfig b/configs/p212_defconfig
index 2ab47e616f..d2c2da10f4 100644
--- a/configs/p212_defconfig
+++ b/configs/p212_defconfig
@@ -48,3 +48,5 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_XHCI_DWC3_OF_SIMPLE=y
CONFIG_USB_DWC3=y
CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y