From d8afcf9a8598ff648dba797ef587ccb3819806c6 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Sun, 8 Jul 2018 23:10:52 -0700 Subject: [PATCH] MLK-18787 mx6sxsabreauto: Fix vga stdout and stderr The u-boot changed to check CONFIG_IS_ENABLED for SYS_CONSOLE_IS_IN_ENV, so we have to set the configuration in defconfig not in header file, otherwise the checking will fail and lead to use vga for stdout and stderr when video is enabled. Fix the issue by moving CONFIG_VIDEO and CONFIG_SYS_CONSOLE_IS_IN_ENV to defconfig and remove duplicated configurations from header file. Signed-off-by: Ye Li --- configs/mx6sxsabreauto_defconfig | 3 +++ configs/mx6sxsabreauto_nand_defconfig | 3 +++ configs/mx6sxsabreauto_optee_defconfig | 3 +++ configs/mx6sxsabreauto_plugin_defconfig | 3 +++ configs/mx6sxsabreauto_qspi1_defconfig | 3 +++ include/configs/mx6sxsabreauto.h | 7 +------ 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index 23116d939a..55b51e9b02 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -58,3 +58,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_IMX_BOOTAUX=y + +CONFIG_VIDEO=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/mx6sxsabreauto_nand_defconfig b/configs/mx6sxsabreauto_nand_defconfig index f1f4c7fbb7..82dea47e31 100644 --- a/configs/mx6sxsabreauto_nand_defconfig +++ b/configs/mx6sxsabreauto_nand_defconfig @@ -61,3 +61,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_IMX_BOOTAUX=y + +CONFIG_VIDEO=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/mx6sxsabreauto_optee_defconfig b/configs/mx6sxsabreauto_optee_defconfig index 114aa2b457..41696e5ef0 100644 --- a/configs/mx6sxsabreauto_optee_defconfig +++ b/configs/mx6sxsabreauto_optee_defconfig @@ -59,3 +59,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_IMX_BOOTAUX=y + +CONFIG_VIDEO=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/mx6sxsabreauto_plugin_defconfig b/configs/mx6sxsabreauto_plugin_defconfig index 6458979c43..6955a13c5c 100644 --- a/configs/mx6sxsabreauto_plugin_defconfig +++ b/configs/mx6sxsabreauto_plugin_defconfig @@ -59,3 +59,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_IMX_BOOTAUX=y + +CONFIG_VIDEO=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/mx6sxsabreauto_qspi1_defconfig b/configs/mx6sxsabreauto_qspi1_defconfig index 0c2e29bf77..76812a6486 100644 --- a/configs/mx6sxsabreauto_qspi1_defconfig +++ b/configs/mx6sxsabreauto_qspi1_defconfig @@ -61,3 +61,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_IMX_BOOTAUX=y + +CONFIG_VIDEO=y +CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index db5d3b4fca..2fa7f51f0d 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -308,15 +308,10 @@ #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} } #endif -#define CONFIG_VIDEO -#define CONFIG_VIDEO_GIS #ifdef CONFIG_VIDEO -#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_GIS #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE -#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP