Commit 00bcaedd5c4063c677d16af264bbcb991fb9675c
1 parent
21c9bcebd0
Exists in
v2017.01-smarct4x
and in
25 other branches
x86: Clean up unused macros in the configuration headers
Legacy video driver macros are not needed. Clean them up. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Showing 5 changed files with 3 additions and 26 deletions Side-by-side Diff
include/configs/cougarcanyon2.h
include/configs/efi-x86.h
include/configs/galileo.h
include/configs/x86-chromebook.h
| ... | ... | @@ -53,15 +53,9 @@ |
| 53 | 53 | |
| 54 | 54 | #define CONFIG_SYS_WHITE_ON_BLACK |
| 55 | 55 | |
| 56 | -#ifdef CONFIG_DM_VIDEO | |
| 57 | -#define VIDEO_DEV "vidconsole" | |
| 58 | -#else | |
| 59 | -#define VIDEO_DEV "vga" | |
| 60 | -#endif | |
| 61 | - | |
| 62 | -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ | |
| 63 | - "stdout=" VIDEO_DEV ",serial\0" \ | |
| 64 | - "stderr=" VIDEO_DEV ",serial\0" | |
| 56 | +#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ | |
| 57 | + "stdout=vidconsole,serial\0" \ | |
| 58 | + "stderr=vidconsole,serial\0" | |
| 65 | 59 | |
| 66 | 60 | #endif |
include/configs/x86-common.h
| ... | ... | @@ -131,13 +131,6 @@ |
| 131 | 131 | /*----------------------------------------------------------------------- |
| 132 | 132 | * Video Configuration |
| 133 | 133 | */ |
| 134 | -#ifndef CONFIG_DM_VIDEO | |
| 135 | -#define CONFIG_VIDEO | |
| 136 | -#define CONFIG_VIDEO_SW_CURSOR | |
| 137 | -#define VIDEO_FB_16BPP_WORD_SWAP | |
| 138 | -#define CONFIG_VGA_AS_SINGLE_DEVICE | |
| 139 | -#define CONFIG_CFB_CONSOLE | |
| 140 | -#endif | |
| 141 | 134 | #define CONFIG_CONSOLE_SCROLL_LINES 5 |
| 142 | 135 | |
| 143 | 136 | /*----------------------------------------------------------------------- |