redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

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 <ye.li@nxp.com>
zero-sugar
Ye Li 2018-07-08 23:10:52 -07:00
parent 331ff420b0
commit d8afcf9a85
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configs/mx6sxsabreauto_defconfig
View File

@ -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

3
configs/mx6sxsabreauto_nand_defconfig
View File

@ -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

3
configs/mx6sxsabreauto_optee_defconfig
View File

@ -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

3
configs/mx6sxsabreauto_plugin_defconfig
View File

@ -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

3
configs/mx6sxsabreauto_qspi1_defconfig
View File

@ -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

7
include/configs/mx6sxsabreauto.h
View File

@ -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