diff options
| author | Bin Meng | 2016-10-09 04:14:20 -0700 |
|---|---|---|
| committer | Bin Meng | 2016-10-12 10:58:24 +0800 |
| commit | 00bcaedd5c4063c677d16af264bbcb991fb9675c (patch) | |
| tree | a46ae98a520907c7c04f1e26a864601773b305d1 /include | |
| parent | 21c9bcebd0e388a7acc2b1a3dc38127e0fd6182c (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/cougarcanyon2.h | 4 | ||||
| -rw-r--r-- | include/configs/efi-x86.h | 2 | ||||
| -rw-r--r-- | include/configs/galileo.h | 4 | ||||
| -rw-r--r-- | include/configs/x86-chromebook.h | 12 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 7 |
5 files changed, 3 insertions, 26 deletions
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h index 88845dc0681..d20ad96562d 100644 --- a/include/configs/cougarcanyon2.h +++ b/include/configs/cougarcanyon2.h @@ -27,8 +27,4 @@ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x5ff000 -/* Video is not supported for now */ -#undef CONFIG_VIDEO -#undef CONFIG_CFB_CONSOLE - #endif /* __CONFIG_H */ diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index 95e46c558d2..5626061e2ee 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -15,8 +15,6 @@ #undef CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_IS_NOWHERE -#undef CONFIG_VIDEO -#undef CONFIG_CFB_CONSOLE #undef CONFIG_SCSI_AHCI #undef CONFIG_SCSI #undef CONFIG_INTEL_ICH6_GPIO diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 40f7fba833b..034142cf7c4 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -31,10 +31,6 @@ #undef CONFIG_SCSI_AHCI #undef CONFIG_SCSI -/* Video is not supported in Quark SoC */ -#undef CONFIG_VIDEO -#undef CONFIG_CFB_CONSOLE - /* SD/MMC support */ #define CONFIG_MMC #define CONFIG_SDHCI diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 7fba7169db2..4bcebfc3e07 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -53,14 +53,8 @@ #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=" VIDEO_DEV ",serial\0" \ - "stderr=" VIDEO_DEV ",serial\0" +#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ + "stdout=vidconsole,serial\0" \ + "stderr=vidconsole,serial\0" #endif diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 96c53b841e9..392654198ac 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -131,13 +131,6 @@ /*----------------------------------------------------------------------- * 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 /*----------------------------------------------------------------------- |