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>

diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index 88845dc0681f10130bbbdb8da6acd3f214acaaee..d20ad96562db48303b2bed61a603f50a7cc91ae1 100644 (file)
--- 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 95e46c558d2c1722fbd983f73b0b97ef9b1c777b..5626061e2ee13185a2f854e6cf9af3ca095439c1 100644 (file)
--- 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 40f7fba833b1d7408e4202dea8b88dbde29fe8a1..034142cf7c40be6b179de9baee9753044e9a3216 100644 (file)
--- 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 7fba7169db2e5a4efc7e285c9771ad3fc02a74f4..4bcebfc3e07808ca6cbb25eae0ee3b571183494e 100644 (file)
--- 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 96c53b841e9b4e3076486b66646f88d4d1d63e45..392654198ac451d107af0cbd377dd65aba6b6236 100644 (file)
--- 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
 
 /*-----------------------------------------------------------------------