V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

x86: Adjust config to support DM_VIDEO 

Update the common configuration so that it works correctly when
CONFIG_DM_VIDEO is enabled. This involves dropping the legacy CONFIG_VIDEO
option and changing the stdio device from "vga" to "vidconsole".

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2016-10-05 20:42:18 -06:00 committed by Bin Meng
parent 2c943804af
commit 0d9483a25c
2 changed files with 10 additions and 2 deletions

10
include/configs/x86-chromebook.h
View File

@ -53,8 +53,14 @@
#define CONFIG_SYS_WHITE_ON_BLACK
#ifdef CONFIG_DM_VIDEO
#define VIDEO_DEV "vidconsole"
#else
#define VIDEO_DEV "vga"
#endif
#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \
"stdout=vga,serial\0" \
"stderr=vga,serial\0"
"stdout=" VIDEO_DEV ",serial\0" \
"stderr=" VIDEO_DEV ",serial\0"
#endif

2
include/configs/x86-common.h
View File

@ -131,11 +131,13 @@
/*-----------------------------------------------------------------------
* Video Configuration
*/
#ifndef CONFIG_DM_VIDEO
#define CONFIG_VIDEO
#define CONFIG_VIDEO_SW_CURSOR
#define VIDEO_FB_16BPP_WORD_SWAP
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CFB_CONSOLE
#endif
#define CONFIG_CONSOLE_SCROLL_LINES 5
/*-----------------------------------------------------------------------