Message ID | 1475721740-15124-11-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Bin Meng |
Headers | show |
On Thu, Oct 6, 2016 at 10:42 AM, Simon Glass <sjg@chromium.org> wrote: > 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> > --- > > Changes in v2: None > > include/configs/x86-chromebook.h | 10 ++++++++-- > include/configs/x86-common.h | 2 ++ > 2 files changed, 10 insertions(+), 2 deletions(-) > applied to u-boot-x86, thanks!
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 312987e..7fba716 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 74b2522..96c53b8 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 /*-----------------------------------------------------------------------