diff options
| author | Simon Glass | 2016-10-05 20:42:18 -0600 |
|---|---|---|
| committer | Bin Meng | 2016-10-11 11:55:33 +0800 |
| commit | 0d9483a25c5c936a87806108c29395f0c7d6b520 (patch) | |
| tree | 77ade4e29c82977d4da81711e86a70fcf6ccead1 /include/configs | |
| parent | 2c943804afdff8817387aa828ef9218efcf1d590 (diff) | |
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>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/x86-chromebook.h | 10 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 312987edc8a..7fba7169db2 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -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 diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 74b25221920..96c53b841e9 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -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 /*----------------------------------------------------------------------- |