[U-Boot] [PATCH 16/28] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig

Simon Glass sjg at chromium.org
Tue Sep 20 00:33:00 CEST 2016


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 at chromium.org>
---

 configs/A10-OLinuXino-Lime_defconfig                    | 1 +
 configs/A10s-OLinuXino-M_defconfig                      | 1 +
 configs/A13-OLinuXinoM_defconfig                        | 1 +
 configs/A13-OLinuXino_defconfig                         | 1 +
 configs/A20-OLinuXino-Lime2_defconfig                   | 1 +
 configs/A20-OLinuXino-Lime_defconfig                    | 1 +
 configs/A20-OLinuXino_MICRO_defconfig                   | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig                    | 1 +
 configs/A33-OLinuXino_defconfig                         | 1 +
 configs/Ainol_AW1_defconfig                             | 1 +
 configs/Ampe_A76_defconfig                              | 1 +
 configs/Auxtek-T003_defconfig                           | 1 +
 configs/Auxtek-T004_defconfig                           | 1 +
 configs/Bananapi_defconfig                              | 1 +
 configs/Bananapro_defconfig                             | 1 +
 configs/CHIP_defconfig                                  | 1 +
 configs/CSQ_CS908_defconfig                             | 1 +
 configs/Chuwi_V7_CW0825_defconfig                       | 3 ++-
 configs/Colombus_defconfig                              | 1 +
 configs/Cubieboard2_defconfig                           | 1 +
 configs/Cubieboard_defconfig                            | 1 +
 configs/Cubietruck_defconfig                            | 1 +
 configs/Empire_electronix_d709_defconfig                | 1 +
 configs/Empire_electronix_m712_defconfig                | 1 +
 configs/Hummingbird_A31_defconfig                       | 1 +
 configs/Hyundai_A7HD_defconfig                          | 1 +
 configs/Itead_Ibox_A20_defconfig                        | 1 +
 configs/Lamobo_R1_defconfig                             | 1 +
 configs/Linksprite_pcDuino3_Nano_defconfig              | 1 +
 configs/Linksprite_pcDuino3_defconfig                   | 1 +
 configs/Linksprite_pcDuino_defconfig                    | 1 +
 configs/MIP405T_defconfig                               | 1 +
 configs/MIP405_defconfig                                | 1 +
 configs/MK808C_defconfig                                | 1 +
 configs/MPC8536DS_36BIT_defconfig                       | 1 +
 configs/MPC8536DS_SDCARD_defconfig                      | 1 +
 configs/MPC8536DS_SPIFLASH_defconfig                    | 1 +
 configs/MPC8536DS_defconfig                             | 1 +
 configs/MPC8544DS_defconfig                             | 1 +
 configs/MPC8572DS_36BIT_defconfig                       | 1 +
 configs/MPC8572DS_defconfig                             | 1 +
 configs/MPC8610HPCD_defconfig                           | 1 +
 configs/MPC8641HPCN_36BIT_defconfig                     | 1 +
 configs/MPC8641HPCN_defconfig                           | 1 +
 configs/MSI_Primo73_defconfig                           | 1 +
 configs/MSI_Primo81_defconfig                           | 3 ++-
 configs/Marsboard_A10_defconfig                         | 1 +
 configs/Mele_A1000G_quad_defconfig                      | 1 +
 configs/Mele_A1000_defconfig                            | 1 +
 configs/Mele_I7_defconfig                               | 1 +
 configs/Mele_M3_defconfig                               | 1 +
 configs/Mele_M5_defconfig                               | 1 +
 configs/Mele_M9_defconfig                               | 1 +
 configs/Mini-X_defconfig                                | 1 +
 configs/MiniFAP_defconfig                               | 1 +
 configs/Orangepi_defconfig                              | 1 +
 configs/Orangepi_mini_defconfig                         | 1 +
 configs/PIP405_defconfig                                | 1 +
 configs/Sinlinx_SinA31s_defconfig                       | 1 +
 configs/Sinlinx_SinA33_defconfig                        | 1 +
 configs/Sinovoip_BPI_M2_defconfig                       | 1 +
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig             | 1 +
 configs/T1024QDS_DDR4_defconfig                         | 1 +
 configs/T1024QDS_NAND_defconfig                         | 3 ++-
 configs/T1024QDS_SDCARD_defconfig                       | 3 ++-
 configs/T1024QDS_SECURE_BOOT_defconfig                  | 1 +
 configs/T1024QDS_SPIFLASH_defconfig                     | 1 +
 configs/T1024QDS_defconfig                              | 1 +
 configs/T1040QDS_DDR4_defconfig                         | 1 +
 configs/T1040QDS_SECURE_BOOT_defconfig                  | 1 +
 configs/T1040QDS_defconfig                              | 1 +
 configs/T1042D4RDB_NAND_defconfig                       | 3 ++-
 configs/T1042D4RDB_SDCARD_defconfig                     | 3 ++-
 configs/T1042D4RDB_SECURE_BOOT_defconfig                | 1 +
 configs/T1042D4RDB_SPIFLASH_defconfig                   | 1 +
 configs/T1042D4RDB_defconfig                            | 1 +
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig          | 3 ++-
 configs/T1042RDB_PI_NAND_defconfig                      | 3 ++-
 configs/T1042RDB_PI_SDCARD_defconfig                    | 3 ++-
 configs/T1042RDB_PI_SPIFLASH_defconfig                  | 1 +
 configs/T1042RDB_PI_defconfig                           | 1 +
 configs/TQM5200_B_HIGHBOOT_defconfig                    | 1 +
 configs/TQM5200_B_defconfig                             | 1 +
 configs/TQM5200_STK100_defconfig                        | 1 +
 configs/TQM5200_defconfig                               | 1 +
 configs/UTOO_P66_defconfig                              | 1 +
 configs/Wexler_TAB7200_defconfig                        | 1 +
 configs/Wits_Pro_A20_DKT_defconfig                      | 1 +
 configs/Wobo_i5_defconfig                               | 1 +
 configs/Yones_Toptech_BD1078_defconfig                  | 1 +
 configs/Yones_Toptech_BS1078_V2_defconfig               | 1 +
 configs/aristainetos2_defconfig                         | 1 +
 configs/aristainetos2b_defconfig                        | 1 +
 configs/aristainetos_defconfig                          | 1 +
 configs/ba10_tv_box_defconfig                           | 1 +
 configs/bayleybay_defconfig                             | 3 ++-
 configs/cgtqmx6eval_defconfig                           | 1 +
 configs/charon_defconfig                                | 1 +
 configs/chromebook_link_defconfig                       | 3 ++-
 configs/chromebox_panther_defconfig                     | 3 ++-
 configs/cm_fx6_defconfig                                | 1 +
 configs/colibri_imx7_defconfig                          | 1 +
 configs/colorfly_e708_q1_defconfig                      | 1 +
 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 3 ++-
 configs/conga-qeval20-qa3-e3845_defconfig               | 3 ++-
 configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig   | 1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig           | 1 +
 configs/coreboot-x86_defconfig                          | 1 +
 configs/crownbay_defconfig                              | 3 ++-
 configs/dfi-bt700-q7x-151_defconfig                     | 3 ++-
 configs/difrnce_dit4350_defconfig                       | 1 +
 configs/digsy_mtc_RAMBOOT_defconfig                     | 1 +
 configs/digsy_mtc_defconfig                             | 1 +
 configs/digsy_mtc_rev5_RAMBOOT_defconfig                | 1 +
 configs/digsy_mtc_rev5_defconfig                        | 1 +
 configs/dms-ba16-1g_defconfig                           | 3 ++-
 configs/dms-ba16_defconfig                              | 3 ++-
 configs/dserve_dsrv9703c_defconfig                      | 1 +
 configs/ea20_defconfig                                  | 1 +
 configs/fo300_defconfig                                 | 1 +
 configs/ga10h_v1_1_defconfig                            | 1 +
 configs/gt90h_v4_defconfig                              | 1 +
 configs/gwventana_defconfig                             | 1 +
 configs/i12-tvbox_defconfig                             | 1 +
 configs/iNet_3F_defconfig                               | 1 +
 configs/iNet_3W_defconfig                               | 1 +
 configs/iNet_86VS_defconfig                             | 1 +
 configs/iNet_D978_rev2_defconfig                        | 1 +
 configs/icnova-a20-swac_defconfig                       | 1 +
 configs/icon_defconfig                                  | 1 +
 configs/imx31_phycore_eet_defconfig                     | 1 +
 configs/inet1_defconfig                                 | 1 +
 configs/inet86dz_defconfig                              | 1 +
 configs/inet97fv2_defconfig                             | 1 +
 configs/inet98v_rev2_defconfig                          | 1 +
 configs/inet9f_rev03_defconfig                          | 1 +
 configs/inet_q972_defconfig                             | 1 +
 configs/ipek01_defconfig                                | 1 +
 configs/jesurun_q5_defconfig                            | 1 +
 configs/ls1021aqds_ddr4_nor_defconfig                   | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig            | 1 +
 configs/ls1021aqds_nand_defconfig                       | 1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig            | 1 +
 configs/ls1021aqds_nor_defconfig                        | 1 +
 configs/ls1021aqds_nor_lpuart_defconfig                 | 1 +
 configs/ls1021aqds_qspi_defconfig                       | 1 +
 configs/ls1021aqds_sdcard_ifc_defconfig                 | 1 +
 configs/ls1021aqds_sdcard_qspi_defconfig                | 1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig            | 1 +
 configs/ls1021atwr_nor_defconfig                        | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig                 | 1 +
 configs/ls1021atwr_qspi_defconfig                       | 1 +
 configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig     | 1 +
 configs/ls1021atwr_sdcard_ifc_defconfig                 | 1 +
 configs/ls1021atwr_sdcard_qspi_defconfig                | 1 +
 configs/lwmon5_defconfig                                | 1 +
 configs/m28evk_defconfig                                | 1 +
 configs/m53evk_defconfig                                | 1 +
 configs/marsboard_defconfig                             | 1 +
 configs/mcx_defconfig                                   | 1 +
 configs/minnowmax_defconfig                             | 3 ++-
 configs/mixtile_loftq_defconfig                         | 1 +
 configs/mk802_a10s_defconfig                            | 1 +
 configs/mk802_defconfig                                 | 1 +
 configs/mk802ii_defconfig                               | 1 +
 configs/mt_ventoux_defconfig                            | 1 +
 configs/mx23evk_defconfig                               | 1 +
 configs/mx28evk_auart_console_defconfig                 | 1 +
 configs/mx28evk_defconfig                               | 1 +
 configs/mx28evk_nand_defconfig                          | 1 +
 configs/mx28evk_spi_defconfig                           | 1 +
 configs/mx51evk_defconfig                               | 1 +
 configs/mx53loco_defconfig                              | 1 +
 configs/mx6cuboxi_defconfig                             | 1 +
 configs/mx6dlsabreauto_defconfig                        | 1 +
 configs/mx6dlsabresd_defconfig                          | 1 +
 configs/mx6qpsabreauto_defconfig                        | 1 +
 configs/mx6qsabreauto_defconfig                         | 1 +
 configs/mx6qsabrelite_defconfig                         | 1 +
 configs/mx6qsabresd_defconfig                           | 1 +
 configs/mx6sabresd_spl_defconfig                        | 1 +
 configs/mx6sxsabresd_defconfig                          | 1 +
 configs/mx6sxsabresd_spl_defconfig                      | 1 +
 configs/mx6ul_14x14_evk_defconfig                       | 1 +
 configs/mx6ul_9x9_evk_defconfig                         | 1 +
 configs/mx7dsabresd_defconfig                           | 1 +
 configs/mx7dsabresd_secure_defconfig                    | 1 +
 configs/nitrogen6dl2g_defconfig                         | 1 +
 configs/nitrogen6dl_defconfig                           | 1 +
 configs/nitrogen6q2g_defconfig                          | 1 +
 configs/nitrogen6q_defconfig                            | 1 +
 configs/nitrogen6s1g_defconfig                          | 1 +
 configs/nitrogen6s_defconfig                            | 1 +
 configs/novena_defconfig                                | 1 +
 configs/parrot_r16_defconfig                            | 1 +
 configs/pdm360ng_defconfig                              | 1 +
 configs/polaroid_mid2407pxe03_defconfig                 | 1 +
 configs/polaroid_mid2809pxe04_defconfig                 | 1 +
 configs/pov_protab2_ips9_defconfig                      | 1 +
 configs/pxm2_defconfig                                  | 1 +
 configs/q8_a13_tablet_defconfig                         | 1 +
 configs/q8_a23_tablet_800x480_defconfig                 | 1 +
 configs/q8_a33_tablet_1024x600_defconfig                | 1 +
 configs/q8_a33_tablet_800x480_defconfig                 | 1 +
 configs/qemu-x86_defconfig                              | 3 ++-
 configs/qemu-x86_efi_payload32_defconfig                | 3 ++-
 configs/qemu-x86_efi_payload64_defconfig                | 3 ++-
 configs/r7-tv-dongle_defconfig                          | 1 +
 configs/riotboard_defconfig                             | 1 +
 configs/rut_defconfig                                   | 1 +
 configs/sansa_fuze_plus_defconfig                       | 1 +
 configs/socrates_defconfig                              | 1 +
 configs/som-db5800-som-6867_defconfig                   | 3 ++-
 configs/sunxi_Gemei_G9_defconfig                        | 1 +
 configs/tbs2910_defconfig                               | 1 +
 configs/theadorable-x86-dfi-bt700_defconfig             | 3 ++-
 configs/theadorable_debug_defconfig                     | 3 ++-
 configs/theadorable_defconfig                           | 3 ++-
 configs/wandboard_defconfig                             | 1 +
 configs/xfi3_defconfig                                  | 1 +
 drivers/video/Kconfig                                   | 9 +++++++++
 drivers/video/cfb_console.c                             | 6 ------
 include/configs/MIP405.h                                | 1 -
 include/configs/MPC8536DS.h                             | 1 -
 include/configs/MPC8544DS.h                             | 1 -
 include/configs/MPC8572DS.h                             | 1 -
 include/configs/MPC8610HPCD.h                           | 1 -
 include/configs/MPC8641HPCN.h                           | 1 -
 include/configs/P1022DS.h                               | 2 --
 include/configs/PIP405.h                                | 1 -
 include/configs/T102xQDS.h                              | 1 -
 include/configs/T102xRDB.h                              | 1 -
 include/configs/T1040QDS.h                              | 1 -
 include/configs/T104xRDB.h                              | 1 -
 include/configs/TQM5200.h                               | 1 -
 include/configs/ac14xx.h                                | 4 ----
 include/configs/advantech_dms-ba16.h                    | 1 -
 include/configs/aria.h                                  | 4 ----
 include/configs/aristainetos-common.h                   | 1 -
 include/configs/cgtqmx6eval.h                           | 1 -
 include/configs/cm_fx6.h                                | 1 -
 include/configs/colibri_imx7.h                          | 1 -
 include/configs/controlcenterd.h                        | 1 -
 include/configs/digsy_mtc.h                             | 1 -
 include/configs/ea20.h                                  | 1 -
 include/configs/embestmx6boards.h                       | 1 -
 include/configs/ge_bx50v3.h                             | 1 -
 include/configs/gw_ventana.h                            | 1 -
 include/configs/icon.h                                  | 1 -
 include/configs/imx31_phycore.h                         | 1 -
 include/configs/ipek01.h                                | 1 -
 include/configs/ls1021aqds.h                            | 1 -
 include/configs/ls1021atwr.h                            | 1 -
 include/configs/lwmon5.h                                | 1 -
 include/configs/m53evk.h                                | 1 -
 include/configs/mcx.h                                   | 1 -
 include/configs/mpc5121ads.h                            | 1 -
 include/configs/mt_ventoux.h                            | 1 -
 include/configs/mx51evk.h                               | 1 -
 include/configs/mx53loco.h                              | 1 -
 include/configs/mx6cuboxi.h                             | 1 -
 include/configs/mx6sabre_common.h                       | 1 -
 include/configs/mx6sxsabresd.h                          | 1 -
 include/configs/mx6ul_14x14_evk.h                       | 1 -
 include/configs/mx7dsabresd.h                           | 1 -
 include/configs/mxs.h                                   | 1 -
 include/configs/nitrogen6x.h                            | 1 -
 include/configs/novena.h                                | 1 -
 include/configs/pdm360ng.h                              | 1 -
 include/configs/pxm2.h                                  | 1 -
 include/configs/rut.h                                   | 1 -
 include/configs/sequoia.h                               | 1 -
 include/configs/socrates.h                              | 1 -
 include/configs/sunxi-common.h                          | 1 -
 include/configs/tbs2910.h                               | 1 -
 include/configs/theadorable.h                           | 1 -
 include/configs/wandboard.h                             | 1 -
 include/configs/x86-common.h                            | 1 -
 scripts/config_whitelist.txt                            | 1 -
 279 files changed, 255 insertions(+), 96 deletions(-)

diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index 8c501e9..ae52fcd 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -19,3 +19,4 @@ CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index 8efe7b7..3cf8514 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -19,3 +19,4 @@ CONFIG_SPL=y
 CONFIG_AXP152_POWER=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 55105d3..65df72f 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 CONFIG_SUNXI_NO_PMIC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 861d83e..16ae6a9 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -33,3 +33,4 @@ CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
 CONFIG_G_DNL_VENDOR_NUM=0x1f3a
 CONFIG_G_DNL_PRODUCT_NUM=0x1010
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index db72f58..5419444 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -21,3 +21,4 @@ CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index 89a1f90..c938c07 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -18,3 +18,4 @@ CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index f8daf7d..9c144ae 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -21,3 +21,4 @@ CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
index 0e41503..7161e51 100644
--- a/configs/A20-Olimex-SOM-EVB_defconfig
+++ b/configs/A20-Olimex-SOM-EVB_defconfig
@@ -24,3 +24,4 @@ CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/A33-OLinuXino_defconfig b/configs/A33-OLinuXino_defconfig
index 48d8f13..f4bbb33 100644
--- a/configs/A33-OLinuXino_defconfig
+++ b/configs/A33-OLinuXino_defconfig
@@ -24,3 +24,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DCDC1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index d2ebdb0..a799a0b 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index 27794cc..7657899 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -24,3 +24,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Auxtek-T003_defconfig b/configs/Auxtek-T003_defconfig
index c8058c8..a1f5e61 100644
--- a/configs/Auxtek-T003_defconfig
+++ b/configs/Auxtek-T003_defconfig
@@ -17,3 +17,4 @@ CONFIG_SPL=y
 CONFIG_AXP152_POWER=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index 2d527f9..b43e4eb 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPL=y
 CONFIG_AXP152_POWER=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 452dc34..20a2b60 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -18,3 +18,4 @@ CONFIG_NETCONSOLE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 25c59e8..b37a38a 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -21,3 +21,4 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP_ALDO4_VOLT=2500
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index be87ca2..a139f12 100644
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -25,3 +25,4 @@ CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
 CONFIG_G_DNL_VENDOR_NUM=0x1f3a
 CONFIG_G_DNL_PRODUCT_NUM=0x1010
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index b36e3bc..d5b5856 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -19,3 +19,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 0524043..0160c48 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -21,7 +21,8 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index d6651d5..5418d2c 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -27,3 +27,4 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index 237e25f..0bd5144 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -16,3 +16,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index a7ce912..a2a83ba 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 8d12b9f..e225328 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -29,3 +29,4 @@ CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
 CONFIG_G_DNL_VENDOR_NUM=0x1f3a
 CONFIG_G_DNL_PRODUCT_NUM=0x1010
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Empire_electronix_d709_defconfig b/configs/Empire_electronix_d709_defconfig
index d8476e5..f1fe1d3 100644
--- a/configs/Empire_electronix_d709_defconfig
+++ b/configs/Empire_electronix_d709_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Empire_electronix_m712_defconfig b/configs/Empire_electronix_m712_defconfig
index 3d96a50..90b9519 100644
--- a/configs/Empire_electronix_m712_defconfig
+++ b/configs/Empire_electronix_m712_defconfig
@@ -24,3 +24,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index 337c92a..9107277 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -19,3 +19,4 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index 9c21991..065ee67 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -23,3 +23,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig
index cda8bbe..8bbd801 100644
--- a/configs/Itead_Ibox_A20_defconfig
+++ b/configs/Itead_Ibox_A20_defconfig
@@ -16,3 +16,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
index 44041d1..3816020 100644
--- a/configs/Lamobo_R1_defconfig
+++ b/configs/Lamobo_R1_defconfig
@@ -17,3 +17,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index e30521c..bc74e14 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -18,3 +18,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 6a89e71..da99c78 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -16,3 +16,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index d6a9a1e..f60ad6a 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 028a112..387d60d 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -15,4 +15,5 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_VIDEO_CT69000=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index ec76163..1acec56 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -17,4 +17,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_VIDEO_CT69000=y
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index 9675481..3a1a9df 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
index 606d542..362a0ee 100644
--- a/configs/MPC8536DS_36BIT_defconfig
+++ b/configs/MPC8536DS_36BIT_defconfig
@@ -24,4 +24,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
index 3c9d2f3..ce21adf 100644
--- a/configs/MPC8536DS_SDCARD_defconfig
+++ b/configs/MPC8536DS_SDCARD_defconfig
@@ -24,4 +24,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
index 0ae4f7a..9c9c9fe 100644
--- a/configs/MPC8536DS_SPIFLASH_defconfig
+++ b/configs/MPC8536DS_SPIFLASH_defconfig
@@ -24,4 +24,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
index aa3c082..a429bea 100644
--- a/configs/MPC8536DS_defconfig
+++ b/configs/MPC8536DS_defconfig
@@ -23,4 +23,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index baacefc..9b314d0 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -18,4 +18,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index b5f0074..80050b3 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -20,4 +20,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index e5bff6e..f5e8f71 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -19,4 +19,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index 6e2eb3d..f79cc04 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -14,4 +14,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_SYS_NS16550=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index a113e37..09c41e7 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -14,4 +14,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_SYS_NS16550=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index 80ab195..61a6ae8 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -13,4 +13,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_SYS_NS16550=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index f3bb2c7..a3e1268 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -17,3 +17,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index e63c19c..2938057 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -21,10 +21,11 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB_MUSB_HOST=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27
 CONFIG_VIDEO_LCD_SSD2828_RESET="PA26"
 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
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 2aaf97b..5a33c5c 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL=y
 CONFIG_SUNXI_NO_PMIC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig
index 71347d8..5f13365 100644
--- a/configs/Mele_A1000G_quad_defconfig
+++ b/configs/Mele_A1000G_quad_defconfig
@@ -22,3 +22,4 @@ CONFIG_AXP_DLDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index c3fcac1..f0ddc2c 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index e041dab..e98423f 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -20,3 +20,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_AXP_DLDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index f4145aa..62f6a3d 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -19,3 +19,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 125ede6..6f1cdb6 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -18,3 +18,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index 212e65c..20f0e63 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -20,3 +20,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_AXP_DLDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index 41a6fae..b50b05c 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index 1613855..6df03b1 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index bf4eb7b..64ce9bf 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -20,3 +20,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 835e3e5..0c803d5 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 1f49c3b..b86d28b 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -17,4 +17,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_VIDEO_CT69000=y
diff --git a/configs/Sinlinx_SinA31s_defconfig b/configs/Sinlinx_SinA31s_defconfig
index ff96c78..855b6e1 100644
--- a/configs/Sinlinx_SinA31s_defconfig
+++ b/configs/Sinlinx_SinA31s_defconfig
@@ -21,3 +21,4 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 98e8148..16c4821 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -22,3 +22,4 @@ CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
 CONFIG_G_DNL_VENDOR_NUM=0x1f3a
 CONFIG_G_DNL_PRODUCT_NUM=0x1010
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Sinovoip_BPI_M2_defconfig b/configs/Sinovoip_BPI_M2_defconfig
index 2782ba2..9ea196a 100644
--- a/configs/Sinovoip_BPI_M2_defconfig
+++ b/configs/Sinovoip_BPI_M2_defconfig
@@ -19,3 +19,4 @@ CONFIG_AXP_ALDO2_VOLT=1800
 CONFIG_AXP_DLDO1_VOLT=3000
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
index f4b4957..5f1f206 100644
--- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
index bf75620..538f813 100644
--- a/configs/T1024QDS_DDR4_defconfig
+++ b/configs/T1024QDS_DDR4_defconfig
@@ -30,4 +30,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 1a44b57..94d739a 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
@@ -39,6 +40,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 20a0d89..bac8558 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
@@ -39,6 +40,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index 8310da5..ef48c3d 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index 8f2a9b3..adbd39b 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -42,4 +42,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index 1b7ed89..5ff9bdd 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -32,4 +32,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
index b6c97c4..d7dd026 100644
--- a/configs/T1040QDS_DDR4_defconfig
+++ b/configs/T1040QDS_DDR4_defconfig
@@ -32,4 +32,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 4f9f71e..40e8d2a5 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -34,6 +34,7 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index a6e55d7..2311eae 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -32,4 +32,5 @@ CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index a7c60f4..2694740 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
@@ -37,7 +38,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index 5d9299a..7b310fb 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
@@ -37,7 +38,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index 61d51bc..b79de38 100644
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -33,6 +33,7 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index a591263..7220d93 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -41,4 +41,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index 4be096d..7e18376 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -31,4 +31,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index 478706a..840de55 100644
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
@@ -41,9 +42,9 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 4afcf1b..123746a 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
@@ -37,7 +38,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index a89b4f2..78eaec8 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
@@ -37,7 +38,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_ESPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index 55a24f4..4ebf014 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -41,4 +41,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index e6668ff..44ea37a 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -31,4 +31,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index 52d8772..49a53bf 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index 1f70551..8acc5d2 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index 12577e2..0e11a00 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index 978a07c..6ef0df7 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index 4f01b684..bb11db9 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -29,3 +29,4 @@ CONFIG_SPL=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index 0af50ae..e6e5db4 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index ef8b3ef..bbbe269 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -21,3 +21,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Wobo_i5_defconfig b/configs/Wobo_i5_defconfig
index 779ddbb..116fcda 100644
--- a/configs/Wobo_i5_defconfig
+++ b/configs/Wobo_i5_defconfig
@@ -17,3 +17,4 @@ CONFIG_AXP_ALDO3_VOLT=3300
 CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index 8011c87..b25940e 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -27,3 +27,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/Yones_Toptech_BS1078_V2_defconfig b/configs/Yones_Toptech_BS1078_V2_defconfig
index 2c1129b..80cf20d 100644
--- a/configs/Yones_Toptech_BS1078_V2_defconfig
+++ b/configs/Yones_Toptech_BS1078_V2_defconfig
@@ -24,3 +24,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 884d364..5e27b73 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -29,4 +29,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index dfeb20c..5c346cb 100644
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -29,4 +29,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index b973ebb..82184a4 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -29,4 +29,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index 013d3b3..2582d71 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -19,3 +19,4 @@ CONFIG_SPL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 5b48adc..cf6317a 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -56,8 +56,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index b7c387b..cf26147 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -48,4 +48,5 @@ CONFIG_G_DNL_MANUFACTURER="Congatec"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index 81d2384..3de627b 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 163e565..90c701d 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -60,9 +60,10 @@ CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index c2df7ae..0e8509e 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -52,9 +52,10 @@ CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 1296229..c3754b2 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -56,4 +56,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 56ff6bf..3b74328 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -41,4 +41,5 @@ CONFIG_G_DNL_MANUFACTURER="Toradex"
 CONFIG_G_DNL_VENDOR_NUM=0x1b67
 CONFIG_G_DNL_PRODUCT_NUM=0x4020
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/colorfly_e708_q1_defconfig b/configs/colorfly_e708_q1_defconfig
index fec7b36..b8947b4 100644
--- a/configs/colorfly_e708_q1_defconfig
+++ b/configs/colorfly_e708_q1_defconfig
@@ -25,3 +25,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_AXP_DLDO2_VOLT=1800
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index d0fdc91..21c87e4 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -64,8 +64,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index dc41207..aab1c4e 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -63,8 +63,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index 2a6f74f..e8bca2d 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -31,5 +31,6 @@ CONFIG_TPM_AUTH_SESSIONS=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_TPM=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index b9ed8a6..9220961 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -31,5 +31,6 @@ CONFIG_TPM_AUTH_SESSIONS=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_TPM=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 7c1f588..95777de 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -44,5 +44,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index baf69d8..b97a60b 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -50,7 +50,8 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index dd4ca36..ab3c9cd 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -61,8 +61,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/difrnce_dit4350_defconfig b/configs/difrnce_dit4350_defconfig
index 8cc883a..c6cf263 100644
--- a/configs/difrnce_dit4350_defconfig
+++ b/configs/difrnce_dit4350_defconfig
@@ -24,3 +24,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index faabd15..0363199 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -25,4 +25,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index 7ba833b..78530e5 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -23,4 +23,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index 29aeb5b..2c4913f 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -25,4 +25,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index cdb77ce..6479b79 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -25,4 +25,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index fbe7370..c6e4d4b 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
 CONFIG_SYS_DDR_1G=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
@@ -32,6 +33,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Advantech"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index b2a2655..8f5db6c 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
+CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
@@ -31,6 +32,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Advantech"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
-CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/dserve_dsrv9703c_defconfig b/configs/dserve_dsrv9703c_defconfig
index ca139a2..c05776e 100644
--- a/configs/dserve_dsrv9703c_defconfig
+++ b/configs/dserve_dsrv9703c_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 55c1ddc..8e63d38 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index 3edb4a2..ed57441 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -22,4 +22,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
index 14ab35d..debe244 100644
--- a/configs/ga10h_v1_1_defconfig
+++ b/configs/ga10h_v1_1_defconfig
@@ -27,3 +27,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/gt90h_v4_defconfig b/configs/gt90h_v4_defconfig
index ac29b29..b7b6d41 100644
--- a/configs/gt90h_v4_defconfig
+++ b/configs/gt90h_v4_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index cd40d51..58282b1 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -55,4 +55,5 @@ CONFIG_G_DNL_MANUFACTURER="Gateworks"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index 821100a..8eaedea 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -16,3 +16,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index a3b521d..edb5dfe 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index e18d2da..f4050c2 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index 1a89573..4ecaabe 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -21,3 +21,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/iNet_D978_rev2_defconfig b/configs/iNet_D978_rev2_defconfig
index 7a415e3..5dd6850 100644
--- a/configs/iNet_D978_rev2_defconfig
+++ b/configs/iNet_D978_rev2_defconfig
@@ -27,3 +27,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig
index 21583f6..0b196df 100644
--- a/configs/icnova-a20-swac_defconfig
+++ b/configs/icnova-a20-swac_defconfig
@@ -23,3 +23,4 @@ CONFIG_SPL=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 6218dd4..15ed170 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -19,4 +19,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index bfb8afe..d148d10 100644
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -9,3 +9,4 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/inet1_defconfig b/configs/inet1_defconfig
index 103adfd..65c70a2 100644
--- a/configs/inet1_defconfig
+++ b/configs/inet1_defconfig
@@ -23,3 +23,4 @@ CONFIG_SPL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/inet86dz_defconfig b/configs/inet86dz_defconfig
index 3810c7c..a8cd1d7 100644
--- a/configs/inet86dz_defconfig
+++ b/configs/inet86dz_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/inet97fv2_defconfig b/configs/inet97fv2_defconfig
index 3345bc3..ff81663 100644
--- a/configs/inet97fv2_defconfig
+++ b/configs/inet97fv2_defconfig
@@ -21,3 +21,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/inet98v_rev2_defconfig b/configs/inet98v_rev2_defconfig
index 8a98f2c..18b41eb 100644
--- a/configs/inet98v_rev2_defconfig
+++ b/configs/inet98v_rev2_defconfig
@@ -24,3 +24,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/inet9f_rev03_defconfig b/configs/inet9f_rev03_defconfig
index df9a029..e06b665 100644
--- a/configs/inet9f_rev03_defconfig
+++ b/configs/inet9f_rev03_defconfig
@@ -21,3 +21,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/inet_q972_defconfig b/configs/inet_q972_defconfig
index 1447bf2..dd703f4 100644
--- a/configs/inet_q972_defconfig
+++ b/configs/inet_q972_defconfig
@@ -24,3 +24,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index bf8d34d..bb6801f 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -15,4 +15,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index 86a40a6..6ec9626 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -17,3 +17,4 @@ CONFIG_SPL=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index ca42427..cd8786e 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -36,3 +36,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 6c59b63..cf72fd2 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -36,3 +36,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
index bce10fe..a9ab030 100644
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -42,4 +42,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index ead87fd..0a6d1fc 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -33,6 +33,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index bab4c56..654a851 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -35,3 +35,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index 54ed484..3fb925f 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -36,3 +36,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index 7f2f88d..a635d9e 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -42,3 +42,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig
index 240ccef..c3a4282 100644
--- a/configs/ls1021aqds_sdcard_ifc_defconfig
+++ b/configs/ls1021aqds_sdcard_ifc_defconfig
@@ -43,3 +43,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig
index caa5320..2b99390 100644
--- a/configs/ls1021aqds_sdcard_qspi_defconfig
+++ b/configs/ls1021aqds_sdcard_qspi_defconfig
@@ -50,3 +50,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index 349e48a..ba58fb9 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -33,6 +33,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
index 333f57d..c026d1e 100644
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -34,3 +34,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index faff062..3a6a656 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -35,3 +35,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index 0afd3db..b7bccd7 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -43,3 +43,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index d4ad393..3998810 100644
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -44,6 +44,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig
index 9e91a5a..43606a8 100644
--- a/configs/ls1021atwr_sdcard_ifc_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_defconfig
@@ -40,4 +40,5 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
index 3232f0e..c2996fc 100644
--- a/configs/ls1021atwr_sdcard_qspi_defconfig
+++ b/configs/ls1021atwr_sdcard_qspi_defconfig
@@ -51,3 +51,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index f5ec1fa..e31f4eb 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -21,4 +21,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 61e13f0..f800369 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -34,4 +34,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index c9f04e0..cad2682 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -30,4 +30,5 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index d5bd37c..e502d47 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -29,4 +29,5 @@ CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index ce548f7..4b29d7e 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -31,4 +31,5 @@ CONFIG_USB_ULPI_VIEWPORT_OMAP=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 386a927..fec6d7f 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -60,8 +60,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index 173efc0..d18ba6a 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -18,3 +18,4 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index b19e018..4e26f2a 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -16,3 +16,4 @@ CONFIG_SPL=y
 CONFIG_AXP152_POWER=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index 62abea2..65371a6 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPL=y
 CONFIG_SUNXI_NO_PMIC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index 3500ebe..5b92c9b 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -12,3 +12,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 508e35e..1534720 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -28,4 +28,5 @@ CONFIG_USB_ULPI_VIEWPORT_OMAP=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index 699a8da..e5c684f 100644
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -25,4 +25,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 1f68823..81c816b 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -32,4 +32,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 1b16c8e..d033261 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -33,4 +33,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 008a54c..e4850dc 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -32,4 +32,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 0852f79..7c4abb5 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -32,4 +32,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 36a8c12..9b29dad 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -18,4 +18,5 @@ CONFIG_CMD_FAT=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 2297619..d2bed74 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -19,4 +19,5 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index b0f89e1..ce5d0c9 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -36,4 +36,5 @@ CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index e345935..42e34c0 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -36,4 +36,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 2b13238..77eccc0 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -36,4 +36,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
index 8efe8d0..e397246 100644
--- a/configs/mx6qpsabreauto_defconfig
+++ b/configs/mx6qpsabreauto_defconfig
@@ -35,4 +35,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index eb26814..75cf436 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -36,4 +36,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 776dfe8..0577310 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -40,4 +40,5 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 4e783cb..fe773d9 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -36,4 +36,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index 415627f..fec20f8 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -44,4 +44,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 2bae2f0..c180f1d 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -29,4 +29,5 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index 5006a91..6c9abe5 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -38,4 +38,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
index 08e7458..a6dfc86 100644
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -35,4 +35,5 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig
index 3656c3c..2a2fc1a 100644
--- a/configs/mx6ul_9x9_evk_defconfig
+++ b/configs/mx6ul_9x9_evk_defconfig
@@ -35,4 +35,5 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 46313cb..ca7c0dd 100644
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -42,4 +42,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig
index 8e05df8..422730c 100644
--- a/configs/mx7dsabresd_secure_defconfig
+++ b/configs/mx7dsabresd_secure_defconfig
@@ -42,4 +42,5 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index e97e523..322f0cd 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -38,4 +38,5 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index ab5e937..7b99d5b 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -38,4 +38,5 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 9fef12f..8caaba5 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -38,4 +38,5 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 5a5986a..b561bb0 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -38,4 +38,5 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 8bc6ca9..3495fc4 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -38,4 +38,5 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 42676eb..b80dfb8 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -38,4 +38,5 @@ CONFIG_G_DNL_MANUFACTURER="Boundary"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 5915010..1d7226f 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -42,4 +42,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index 39ecbd2..42100f5 100644
--- a/configs/parrot_r16_defconfig
+++ b/configs/parrot_r16_defconfig
@@ -25,3 +25,4 @@ CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
 CONFIG_G_DNL_VENDOR_NUM=0x1f3a
 CONFIG_G_DNL_PRODUCT_NUM=0x1010
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
index 9f7801c..20fa553 100644
--- a/configs/pdm360ng_defconfig
+++ b/configs/pdm360ng_defconfig
@@ -15,4 +15,5 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/polaroid_mid2407pxe03_defconfig b/configs/polaroid_mid2407pxe03_defconfig
index be4bf8e..f62ecbb 100644
--- a/configs/polaroid_mid2407pxe03_defconfig
+++ b/configs/polaroid_mid2407pxe03_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/polaroid_mid2809pxe04_defconfig b/configs/polaroid_mid2809pxe04_defconfig
index d4fcf79..862f124 100644
--- a/configs/polaroid_mid2809pxe04_defconfig
+++ b/configs/polaroid_mid2809pxe04_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/pov_protab2_ips9_defconfig b/configs/pov_protab2_ips9_defconfig
index fccb2a8..4cd7093 100644
--- a/configs/pov_protab2_ips9_defconfig
+++ b/configs/pov_protab2_ips9_defconfig
@@ -22,3 +22,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index bfac212..91b74fc 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -58,3 +58,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_CFB_CONSOLE=y
 CONFIG_SYS_CONSOLE_BG_COL=0xff
 CONFIG_SYS_CONSOLE_FG_COL=0x00
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/q8_a13_tablet_defconfig b/configs/q8_a13_tablet_defconfig
index 41c2329..7d06ce0 100644
--- a/configs/q8_a13_tablet_defconfig
+++ b/configs/q8_a13_tablet_defconfig
@@ -24,3 +24,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/q8_a23_tablet_800x480_defconfig b/configs/q8_a23_tablet_800x480_defconfig
index a8562ae..24906da 100644
--- a/configs/q8_a23_tablet_800x480_defconfig
+++ b/configs/q8_a23_tablet_800x480_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/q8_a33_tablet_1024x600_defconfig b/configs/q8_a33_tablet_1024x600_defconfig
index 3f0d885..c97a97e 100644
--- a/configs/q8_a33_tablet_1024x600_defconfig
+++ b/configs/q8_a33_tablet_1024x600_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/q8_a33_tablet_800x480_defconfig b/configs/q8_a33_tablet_800x480_defconfig
index d003aa6..6db2ed1 100644
--- a/configs/q8_a33_tablet_800x480_defconfig
+++ b/configs/q8_a33_tablet_800x480_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPL=y
 CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_USB_MUSB_HOST=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index cf43cad..b33a413 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -47,8 +47,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 102c2f9..f303ec3 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -44,10 +44,11 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=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 133fb88..fd78dfe 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -44,10 +44,11 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 2a864ff..be7ea98 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPL=y
 CONFIG_AXP152_POWER=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 10cf974..b7f6d9e 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -29,4 +29,5 @@ CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index eda5d7b..fee7c96 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -58,3 +58,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_CFB_CONSOLE=y
 CONFIG_SYS_CONSOLE_BG_COL=0xff
 CONFIG_SYS_CONSOLE_FG_COL=0x00
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index 2da09bc..860cc6d 100644
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -25,4 +25,5 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 4ade2ff..1141990 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -21,4 +21,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 41bdd49..19dd16c 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -58,8 +58,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index ee869d3..7a3451b 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -19,3 +19,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 0f74aa7..a5af151 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -42,4 +42,5 @@ CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index ea0b772..7a1da94 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -58,8 +58,9 @@ CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 98af9ba..5eb7040 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -48,5 +48,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
index 82b3e88..1831259 100644
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -38,7 +38,8 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
-CONFIG_CFB_CONSOLE=y
 CONFIG_VIDEO_MVEBU=y
+CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_REGEX=y
 CONFIG_LIB_RAND=y
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 1375ca2..af8e618 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -36,4 +36,5 @@ CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index b537a44..6b07ccd 100644
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -24,4 +24,5 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_CFB_CONSOLE=y
+CONFIG_VGA_AS_SINGLE_DEVICE=y
 CONFIG_OF_LIBFDT=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index de6f419..278600c 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -471,6 +471,15 @@ 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
+	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 ac7c402..3a8e20b 100644
--- 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 d746ddb..b7ee708 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -348,7 +348,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 e4fec53..0900540 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -508,7 +508,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 23e8de4..76eb674 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -281,7 +281,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 1571c8a..3f43d75 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -468,7 +468,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 699293c..c5295f9 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -27,7 +27,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 ce4e33f..37dd44e 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -381,7 +381,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 c4e3e65..e391088 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -382,7 +382,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
@@ -403,7 +402,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 07514e2..4589b21 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -304,7 +304,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 d8a53bc..1c18495 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -503,7 +503,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 d8792d6..9b0b917 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -501,7 +501,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 af63dd3..2ae6573 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -415,7 +415,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 cf59eb7..4b5e451 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -485,7 +485,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_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 9ecc363..c5705f5 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -108,7 +108,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 f1013c4..2f3668a 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -32,10 +32,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 840e3d9..2cbbac2 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -276,7 +276,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 7b7e6e2..d7b043c 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -39,10 +39,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 a472d76..d786778 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -235,7 +235,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 8e5b538..9f6b950 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -94,7 +94,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 55a5f93..bb036dc 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -256,7 +256,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 bbe9c81..d3b43eb 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -231,7 +231,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 7b8022d..2372ddf 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -231,7 +231,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 b90554f..2551de4 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -81,7 +81,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 eac37c3..58493e9 100644
--- 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 e115fd5..9e0c945 100644
--- 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 3baac67..c1053f8 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -307,7 +307,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 9f4d1a0..050c055 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -182,7 +182,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 f858b99..c38a254 100644
--- 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 5a20437..f833f7d 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -184,7 +184,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 99200d1..436bc75 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -51,7 +51,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 95b68b4..5ffdd19 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -444,7 +444,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 3c596f3..d1e01fe 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -332,7 +332,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 ffbad27..eb68fa0 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -365,7 +365,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 9abd450..aefe804 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -202,7 +202,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 1b95479..ed82b9c 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -372,7 +372,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 ac3ac35..50a6ccd 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -39,7 +39,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 3ec2358..2420612 100644
--- 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 4ecd7fd..968662d 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -97,7 +97,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 89e5557..258a856 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -216,7 +216,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 158858f..82957d6 100644
--- 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 a45c589..71a4231 100644
--- 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 e288ad8..b45ad72 100644
--- 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 a4d18e9..16dabce 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -236,7 +236,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 c0c9b12..39ea3c2 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -261,7 +261,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 52083c8..33459d7 100644
--- 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 d18c177..63ef4e7 100644
--- 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 40194f0..0983b96 100644
--- 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 acadf72..f5fcef8 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -41,7 +41,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 6cc8d6c..2aa184a 100644
--- 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 11f9a25..3d7b85f 100644
--- 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 facfdac..153646f 100644
--- 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 5abdd23..9d92a06 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -176,7 +176,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 30da5c9..1694d06 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -299,7 +299,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 340ae9c..da1dea8 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -75,7 +75,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 365019a..fe2ca6f 100644
--- 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 aacf4ef..4d219e2 100644
--- 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/include/configs/x86-common.h b/include/configs/x86-common.h
index 7633a43..c1f6b91 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -131,7 +131,6 @@
  */
 #define CONFIG_VIDEO_SW_CURSOR
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_CONSOLE_SCROLL_LINES 5
 
 /*-----------------------------------------------------------------------
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0eaee5b..8562f90 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8276,7 +8276,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
-- 
2.8.0.rc3.226.g39d4020



More information about the U-Boot mailing list