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>
This commit is contained in:
Bin Meng 2016-10-09 04:14:20 -07:00
parent 21c9bcebd0
commit 00bcaedd5c
5 changed files with 3 additions and 26 deletions

View file

@ -27,8 +27,4 @@
#define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x1000
#define CONFIG_ENV_OFFSET 0x5ff000 #define CONFIG_ENV_OFFSET 0x5ff000
/* Video is not supported for now */
#undef CONFIG_VIDEO
#undef CONFIG_CFB_CONSOLE
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

View file

@ -15,8 +15,6 @@
#undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#undef CONFIG_VIDEO
#undef CONFIG_CFB_CONSOLE
#undef CONFIG_SCSI_AHCI #undef CONFIG_SCSI_AHCI
#undef CONFIG_SCSI #undef CONFIG_SCSI
#undef CONFIG_INTEL_ICH6_GPIO #undef CONFIG_INTEL_ICH6_GPIO

View file

@ -31,10 +31,6 @@
#undef CONFIG_SCSI_AHCI #undef CONFIG_SCSI_AHCI
#undef CONFIG_SCSI #undef CONFIG_SCSI
/* Video is not supported in Quark SoC */
#undef CONFIG_VIDEO
#undef CONFIG_CFB_CONSOLE
/* SD/MMC support */ /* SD/MMC support */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_SDHCI #define CONFIG_SDHCI

View file

@ -53,14 +53,8 @@
#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_SYS_WHITE_ON_BLACK
#ifdef CONFIG_DM_VIDEO #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \
#define VIDEO_DEV "vidconsole" "stdout=vidconsole,serial\0" \
#else "stderr=vidconsole,serial\0"
#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"
#endif #endif

View file

@ -131,13 +131,6 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Video Configuration * 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 #define CONFIG_CONSOLE_SCROLL_LINES 5
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------