From 01790b016ec744ec3b1f13f9fdb24417b3168879 Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Thu, 20 Dec 2018 15:09:12 +0100 Subject: 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 Signed-off-by: Neil Armstrong Reviewed-by: Anatolij Gustschin --- configs/khadas-vim2_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs/khadas-vim2_defconfig') 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 -- cgit