Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig

This converts the following to Kconfig:
   CONFIG_VGA_AS_SINGLE_DEVICE

Once we migrate to driver model for video, we should be able to drop this
option.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 8507f730011695ef6a3b6441d14239b356021ae6..a67038b1bbb5c3636680e17f4a469ffd8dafa465 100644 (file)
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -22,3 +22,4 @@ CONFIG_USB_MUSB_HOST=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
+CONFIG_CFB_CONSOLE=y

diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index 8847271862aa04a16888ceb98b1537443b1ec6f7..e9d5be421b15758846df84b5e3a23b80b4ed4a27 100644 (file)
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -25,3 +25,4 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9"
 CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
 CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
 CONFIG_VIDEO_LCD_SPI_MISO="PH12"
+CONFIG_CFB_CONSOLE=y

diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index f8f5f5cc2b8159e4dc3334f3facbb6138c87a5a0..d176d52d6f81e97050ffe12f142463aba877a15e 100644 (file)
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -57,4 +57,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index ce051de10b263ee08bc7336dbb17779384ae4331..86fc66bc8823c6f1d8be0227c871e939a796d541 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -61,5 +61,6 @@ CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_VIDEO_IVYBRIDGE_IGD=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index a13612c0975c08338c46abe4460caefeb100530b..7ce29fb17b4ef52a8b3ec509bd15c98cae1c7015 100644 (file)
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -52,5 +52,6 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 6bee9c6de1858c3ca74caefac9e9f31006f44244..784270c0fd567c6cca028bbee706527c9da50304 100644 (file)
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -65,4 +65,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 76ff9042100b901b44abb22de193ec4bb41cd367..b5ef5701932ebcf3ed265ef9c9c0822919a8bca6 100644 (file)
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -64,4 +64,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 7d25f436533c2e9425a3d89ec4db6239604b7bb5..5bd7493c6de987ce330f5fc246ecf4680a68ee12 100644 (file)
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -50,4 +50,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 3931896098f25de39f86a03ea2eb11e215cf0b4a..6dd1c39d77441f18617091fc3ce8f2680a2db118 100644 (file)
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -62,4 +62,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 1446ab61368ff7533027dfc0d46227e4851f1adb..614dd57e118344f2b30f407e241ee04c9db80123 100644 (file)
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -61,4 +61,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 65c5d6874084fbcd464e0e5ed7f15eae2d0e69ee..ef60fab6e794089aa60a9de0a1b28dc86f5a5170 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -24,3 +24,4 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_CFB_CONSOLE_ANSI=y
+# CONFIG_VGA_AS_SINGLE_DEVICE is not set

diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 392157055ca865b87a3d38eef55c3cbc1c0aa367..9a3a6f5dddfcc6674edd38096c0d107256180902 100644 (file)
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -48,4 +48,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index dc3b9faf141dfd974a31bd6080d7eb8ea1c32345..296fee481dee46706211efcea1589071a531969c 100644 (file)
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -45,6 +45,7 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y

diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index e1b30ed9c7ecc7670a3e042963886e1e155d053e..129d3ee091fedf72a3f8baefb9912a76bc1be5e7 100644 (file)
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -45,6 +45,7 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y

diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 9fc169d48aab46ad6bf2140b5dee4079f439eef2..715311fe2c9e7760485c3f31264c2ea74e5287bf 100644 (file)
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -59,4 +59,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 43dc2fa66e59de1de30330635dcc13386f3ee156..4f33f62c596002822f68ccec7e45e8c829ed7cd1 100644 (file)
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -59,4 +59,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 7130dc8c238ffebb674078848a61b223f742182e..60f44868320809d991d20d5ca55f8586446d8e70 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -52,3 +52,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y

diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
index 52c49d06fb8b098a41a390a16e82c2e01b8725f0..24a0dbedcbf7c67a30d469f6f634b3ebd1961c87 100644 (file)
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -42,5 +42,6 @@ CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y
 CONFIG_REGEX=y
 CONFIG_LIB_RAND=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 39992466495c23acaf3f5a519c2bfe842ec41e54..a842da6f11eb6be1c0023b7d268e940f095f2a43 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -493,6 +493,16 @@ config CFB_CONSOLE_ANSI
          erase functions and limited graphics rendition control). Normal
          output from U-Boot will pass through this filter.
 
+config VGA_AS_SINGLE_DEVICE
+       bool "Set the video as an output-only device"
+       depends on CFB_CONSOLE
+       default y
+       help
+         If enable the framebuffer device will be initialized as an
+         output-only device. The Keyboard driver will not be set up. This
+         may be used if you have no keyboard device, or more than one
+         (USB Keyboard, AT Keyboard).
+
 config VIDEO_CT69000
        bool "Enable Chips & Technologies 69000 video driver"
        depends on VIDEO

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index ac7c40298b0f3f3380a1b2f9f7479c4be560fe76..3a8e20bcca99599dfeca76ed2aed328f328410a4 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -58,12 +58,6 @@
  *                                     info);
  *                             that fills a info buffer at i=row.
  *                             s.a: board/eltec/bab7xx.
- * CONFIG_VGA_AS_SINGLE_DEVICE - If set the framebuffer device will be
- *                             initialized as an output only device.
- *                             The Keyboard driver will not be
- *                             set-up.  This may be used, if you have
- *                             no or more than one Keyboard devices
- *                             (USB Keyboard, AT Keyboard).
  *
  * CONFIG_VIDEO_SW_CURSOR:    - Draws a cursor after the last
  *                             character. No blinking is provided.

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 11f16c5c73d8cc549bc071c1385325d444b55369..3cc7f673891975170b0fda7dfd4d90ab42f76069 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -341,7 +341,6 @@
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #undef CONFIG_VIDEO_ONBOARD
 /************************************************************

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 50e30e2e80fc0ac26f45d97f2d88c3fdebffc3bb..949b807873719fb3ba668a77a85efea4eee19f8d 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -507,7 +507,6 @@
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index fdce09fc96a6481bacd84e9e441cf675860abea1..0e907831a637c0e4f8d81f1ed2410b6dfae98643 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -279,7 +279,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index c0abd0e1de54559489af4e0f80f99d41693d45ef..034940a8bc901e696d491b5d5904947cbd8dc354 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -466,7 +466,6 @@
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 8eff79e90dcea0adba1da1d352665966bb82b2a0..bd2e57e77e87db127308cffcd0a8ceb46822da81 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x2c000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index c4dc8da86f4c3cb6a6f57f0a55ef2bde1c223f84..35718368bf53b4f7568c62b88b60d52a71491dea 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -379,7 +379,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #if defined(CONFIG_VIDEO)
 #define CONFIG_BIOSEMU
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE2_IO_VIRT

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index c4ff9223aa64e40cfd5cd9d4644e92782fb85678..cf258de8ca3d9c1cd02d2b7f5e1527c14182d85a 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -380,7 +380,6 @@
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x10000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
@@ -401,7 +400,6 @@
 #define CONFIG_ATI_RADEON_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif
 
 /* I2C */

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index f43f221104bbdb050badf76e17aa0507e19d2ebc..5faeb90007e8595e270d2e341a4ed93b3a071005 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -301,7 +301,6 @@
  ************************************************************/
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_ONBOARD           /* Video controller is on-board */
 

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index b5f171295db146612b670a874e087893c7992d36..893155d095a128b25e4be507bf90fa555c77840a 100644 (file)
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -504,7 +504,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 3d221e3ddb9937edb4e878067886070dee450b09..9bed457e12fc556b4156bdff917d8ecedf87fde2 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -510,7 +510,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index ca87180fe8c351e98398100a31ab1d0bbd25538a..e82ef895f65bf0a49bc6b1b9f51c54bd8c02686a 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -414,7 +414,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 50ca2d759d83a60ae62f70e54e4d9bc18c39bd55..35019d7a43882fb7a14e129e64f85d7ed48b4855 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -526,7 +526,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x180000)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index cc8d2cdc188358b5f7e25c8c78a535fe6ca1416f..da8fb5544e34b44d2130359a004120602ee831bd 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -107,7 +107,6 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #endif
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #endif /* #ifndef CONFIG_TQM5200S */

diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index bdff6db7250253c18fd887d792bba35095e3ebf9..2d1c099b97cd0caaa350ca54d5940c1f7329d0c8 100644 (file)
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -31,10 +31,6 @@
 
 #define CONFIG_SYS_TEXT_BASE   0xFFF00000
 
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
 #define CONFIG_SYS_MPC512X_CLKIN       25000000        /* in Hz */
 #define SCFR1_IPS_DIV                  2
 #define SCFR1_LPC_DIV                  2

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index db50a7109eeeb9d3dff256adb17ecafe157b1329..854c0c415195b2da76dff7d7818d19145ef5915d 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -273,7 +273,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/aria.h b/include/configs/aria.h
index ec13b584a6a1fa0c266c98bd761e0f9e59c122b3..b08e90c6789d50845557a8a86440652a79f6c62b 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -38,10 +38,6 @@
 
 /* video */
 
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
 /* CONFIG_PCI is defined at config time */
 
 #define CONFIG_SYS_MPC512X_CLKIN       33000000        /* in Hz */

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 0ec573262d6a0e37a1834e1cb0ae860dbb523687..93083fc0549956a5f798e7d78d94b04800fc85a9 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -231,7 +231,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 /* check this console not needed, after test remove it */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 1c76b5e0fcb425f4866287d928fb0b5f3a9baf44..b016f20a8d1ebbd3743248a191037b9c4dd85094 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -89,7 +89,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 767368c321ae64f64fe7f220097625acb82446c8..3b55d20cf7881df48f6f671dab4b2e0ac3529991 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -255,7 +255,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_IMX_HDMI
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 23b298db806ce8fde8ce0e9ccd15105a2ca510e7..3a4da8635a163807faeaeeb7c0d7da2a86211325 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -225,7 +225,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 47a3002761c10e711cd7cc01fdd925785eb4a8d8..6770bd063d6f521642e8c5bd5bb8559ddf33e09d 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -225,7 +225,6 @@
  */
 #define CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 
 /*

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 5e1a86be59a8c15f893a3987332a673bf64b334a..f62dba4a34f4b862dce058bb7d4abc3d303bfe69 100644 (file)
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -80,7 +80,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)       /* decompressed img */

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index d3ca706070ccce8d6361bf9f05117ff12608aeca..8c356887f15de4c635064d5ccdd073d25ed0d480 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -102,7 +102,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_CONSOLE_INFO_QUIET

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index e115fd5872bff23eb03c6e438ae479208b94d8f3..9e0c945c793019446413688ba948e8ddf3f7ee8b 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -118,7 +118,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 57eec0c29600dccdaa2546f152743a42ff5a17f5..44155e758d4ed3817235bba831085f25164b8568 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -309,7 +309,6 @@
 /* Framebuffer */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index c0dadd06c0383695b1db20c28e9b175dcd8c412d..83a14531f579ab53ee3258f17f8d3cb77ac1f1e1 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -179,7 +179,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IPUV3_CLK          260000000
 #define CONFIG_CMD_HDMIDETECT

diff --git a/include/configs/icon.h b/include/configs/icon.h
index f858b99c3f1e66fda125600551c84d6b9a78fa35..c38a254a66c37c1a5b7367043627dc84f8e40510 100644 (file)
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -134,7 +134,6 @@
 #define VIDEO_FB_LITTLE_ENDIAN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index ece3d459099e6a5a8a6d7360d7178d714f14837a..f8dcf294f8860bfceec3af746ed2f9973284eb9e 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -181,7 +181,6 @@
 #define CONFIG_VIDEO_MX3
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP
 #define CONFIG_BMP_16BPP

diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 447190ad0689e5cf014d5feca853d073ab93860d..d7a52a08d43c027baab6b23b9b802d863b4e683f 100644 (file)
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -50,7 +50,6 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 93c7864f584223b27248f3d4eb904cf39cdfd844..eb4d03769fd7c8a3d4dc95a7112d20dd41eb25df 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -445,7 +445,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_FSL_DCU_FB
 #define CONFIG_CMD_BMP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 8da01ddb60b66e00eeaf04025f5540f7aa5fd3a0..dd95a67e2252dea19a8c99612dd5fa744a791a88 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -327,7 +327,6 @@
 
 #ifdef CONFIG_FSL_DCU_FB
 #define CONFIG_CMD_BMP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 58446b559e59a287e6842820cee5d2f4fca6ef6c..d812e66475526a269767b53b85581008af5be7e8 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -360,7 +360,6 @@
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 2fa56d69cee5ed1447ca4df162edca50201ae50f..7e05bfd6b43424670e97bde9d9edf732da19dabf 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -199,7 +199,6 @@
  */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index d113ec43133627145ccbf0213850caa612842ee6..b9a2ad35212789f3ee35a9ff1a52ede5a6f77659 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -365,7 +365,6 @@
 #define CONFIG_NET_RETRY_COUNT 10
 #endif
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP

diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index ddf6c7c8a9175695020881ee95dbf9f2a516b268..0181887cc0e424c8037dbf4a2b126d206ae43393 100644 (file)
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_DIU_ADDR    (CONFIG_SYS_IMMR + 0x2100)
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #endif

diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 3ec23584c2db54bdae0231cf4bb4cc6ba5036f51..2420612800fbde9b658ed8e97dcf7e8d97d63bf1 100644 (file)
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -51,7 +51,6 @@
 #define CONFIG_FPGA_DELAY() udelay(1)
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index e02decbd1b48d4b9520343a173c698663790b4d6..664e2dd2522a1c9ea9cf198c4377e5b679c85310 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -94,7 +94,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index f5ee433b1dd1936d783c98b5af5c1f9983a10088..2ee6d989b6f88246278a863622132d1f66a55c9f 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -214,7 +214,6 @@
 /* Framebuffer and LCD */
 #define CONFIG_PREBOOT
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 158858fc933e8e4bcb29769e66f31c53bb9dbf3b..82957d62831ba66066d937f169555211e4fdc7e4 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -35,7 +35,6 @@
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK               260000000
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index fb380ba15a633cff904fadb220977693ba7edd6b..9a0b0a2d2c0c4cd61151b1fee7a4e1fd7b9a5e18 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -209,7 +209,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index e288ad8c4152f2fff21fb374bc2011489c53fd7f..b45ad72a629a807eb27a110c84ce1812f0b2dfe3 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -209,7 +209,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 5354f4bf020e2ac12f03d4e41e2d1fa9511bf33d..0cead00c76d3b42c2c79c85f7e90ce7ca61e291c 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -229,7 +229,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index c7715a006cdc32bdc7fbb042c2488c2ad19efed0..978b4fac38473a78f76ee85fad2fcd74812cdd93 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -254,7 +254,6 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_CMD_BMP

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 52083c8ff351c39678d998a8fe4e716289442a21..33459d7efa959204d0e760e7d4e7dd78db32ff57 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -145,7 +145,6 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #endif
 
 /* MMC */

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index d18c177c1183a4ad3de1e29247bd59a2cabe9ce2..63ef4e7a2fc0ff207b86a005ab73d11f1ae9a05f 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -93,7 +93,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 40194f06ee22ef0df4150536f51a5e2716b098ae..0983b96c5005ae0cf6b7397b6a80604e606f57c2 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -161,7 +161,6 @@
 /* Video output */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP

diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index efb312f101e9607109f24b0af9162e31c67ac1cf..eca984a9efc08a6299731514cd3ad7c7df4acc84 100644 (file)
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -40,7 +40,6 @@
 /* Video */
 
 #if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_RLE8

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 6cc8d6c653c4dbfd5de205061e6f2d495e7bd6ef..2aa184a2c2d6f8001b3346ae130b04374d439b01 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -126,7 +126,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/rut.h b/include/configs/rut.h
index 11f9a250e1085a95cdac2f5c9f64352c5a1c9908..3d7b85f306ca98ffd040bc8709503810b2de7854 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -120,7 +120,6 @@
 
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index facfdac11f10e76d3e6881ddd547cd45fc7b03a5..153646f940dba6f9ab4292bd54b91eb685627eab 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -411,7 +411,6 @@
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SPLASH_SCREEN
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 #endif
 

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index ad32b918cb24acc285ba4bf83a7747d91a9d3782..2328c78ce77747fc609ab4f19bc9dcfbe4332b5e 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -175,7 +175,6 @@
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index c95efd9898fb34d455ec43a84c6acd6034244aea..239f84afce2f86e36a009f1773293c37543622f8 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -296,7 +296,6 @@ extern int soft_i2c_gpio_scl;
 
 /* allow both serial and cfb console. */
 /* stop x86 thinking in cfbconsole from trying to init a pc keyboard */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 
 #endif /* CONFIG_VIDEO */
 

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index f77e88e4c32e2224d0b7a5bf3225dd690a5d5631..cf4134f295c38c7b2f8b8edb4403321c3bdbaa6b 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -77,7 +77,6 @@
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK               260000000
 #define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 365019ab7c7dbc46a879310f66d2b2e1529d2e10..fe2ca6f433712c359bb086e5493c30327de5e520 100644 (file)
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -96,7 +96,6 @@
 /* Enable LCD and reserve 512KB from top of memory*/
 #define CONFIG_SYS_MEM_TOP_HIDE                0x80000
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CMD_BMP
 
 /* FPGA programming support */

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index ab0ca15745b69eb2f26a5f20fb46b169698d6271..d089b53e88e9ce090582aec6a35c30c7210bcc57 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -75,7 +75,6 @@
 
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 767a631b923d0315076502ee23027cf0c206a1d3..df489f4649b11efc3525801751d85caf0a586cdf 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8251,7 +8251,6 @@ CONFIG_VERY_BIG_RAM
 CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
 CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
 CONFIG_VF610
-CONFIG_VGA_AS_SINGLE_DEVICE
 CONFIG_VID
 CONFIG_VIDEO_BCM2835
 CONFIG_VIDEO_BMP_GZIP