This converts the following to Kconfig: CONFIG_VGA_AS_SINGLE_DEVICE
Once we migrate to driver model for video, we should be able to drop this option.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: None
configs/Chuwi_V7_CW0825_defconfig | 2 +- configs/MSI_Primo81_defconfig | 2 +- configs/T1024QDS_NAND_defconfig | 2 +- configs/T1024QDS_SDCARD_defconfig | 2 +- configs/T1042D4RDB_NAND_defconfig | 2 +- configs/T1042D4RDB_SDCARD_defconfig | 2 +- configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_PI_NAND_defconfig | 2 +- configs/T1042RDB_PI_SDCARD_defconfig | 2 +- configs/bayleybay_defconfig | 3 +-- configs/chromebook_link_defconfig | 3 +-- configs/chromebox_panther_defconfig | 3 +-- configs/cm_fx6_defconfig | 1 - configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 3 +-- configs/conga-qeval20-qa3-e3845_defconfig | 3 +-- configs/coreboot-x86_defconfig | 1 - configs/crownbay_defconfig | 3 +-- configs/dfi-bt700-q7x-151_defconfig | 3 +-- configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/gwventana_defconfig | 1 - configs/minnowmax_defconfig | 3 +-- configs/mx6cuboxi_defconfig | 1 - configs/mx6qsabrelite_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/qemu-x86_defconfig | 3 +-- configs/qemu-x86_efi_payload32_defconfig | 3 +-- configs/qemu-x86_efi_payload64_defconfig | 3 +-- configs/som-db5800-som-6867_defconfig | 3 +-- configs/tbs2910_defconfig | 1 - configs/theadorable-x86-dfi-bt700_defconfig | 3 +-- configs/theadorable_debug_defconfig | 2 +- configs/theadorable_defconfig | 2 +- drivers/video/Kconfig | 10 ++++++++++ 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 - 98 files changed, 36 insertions(+), 122 deletions(-)
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig index e4ad8c9..147ee29 100644 --- a/configs/Chuwi_V7_CW0825_defconfig +++ b/configs/Chuwi_V7_CW0825_defconfig @@ -20,7 +20,7 @@ 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 diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index a05cf5f..d4b2294 100644 --- a/configs/MSI_Primo81_defconfig +++ b/configs/MSI_Primo81_defconfig @@ -20,10 +20,10 @@ 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 diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig index fd1c6c2..f37fb08 100644 --- a/configs/T1024QDS_NAND_defconfig +++ b/configs/T1024QDS_NAND_defconfig @@ -6,6 +6,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,5 @@ CONFIG_SYS_NS16550=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y -CONFIG_VIDEO=y CONFIG_CFB_CONSOLE=y CONFIG_OF_LIBFDT=y diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig index 66d22fa..09fff32 100644 --- a/configs/T1024QDS_SDCARD_defconfig +++ b/configs/T1024QDS_SDCARD_defconfig @@ -6,6 +6,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,5 @@ CONFIG_SYS_NS16550=y CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y -CONFIG_VIDEO=y CONFIG_CFB_CONSOLE=y CONFIG_OF_LIBFDT=y diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig index fff6c4d..ba0dea2 100644 --- a/configs/T1042D4RDB_NAND_defconfig +++ b/configs/T1042D4RDB_NAND_defconfig @@ -6,6 +6,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,6 @@ 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_OF_LIBFDT=y diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig index 657a2cb..55b6ea8 100644 --- a/configs/T1042D4RDB_SDCARD_defconfig +++ b/configs/T1042D4RDB_SDCARD_defconfig @@ -6,6 +6,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,6 @@ 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_OF_LIBFDT=y diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig index c915b17..62f45db 100644 --- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig @@ -6,6 +6,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,7 +42,6 @@ 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_RSA=y diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig index ffd0ec1..63e4e92 100644 --- a/configs/T1042RDB_PI_NAND_defconfig +++ b/configs/T1042RDB_PI_NAND_defconfig @@ -6,6 +6,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,6 @@ 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_OF_LIBFDT=y diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig index 9a41b6a..833da15 100644 --- a/configs/T1042RDB_PI_SDCARD_defconfig +++ b/configs/T1042RDB_PI_SDCARD_defconfig @@ -6,6 +6,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,6 @@ 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_OF_LIBFDT=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 5b48adc..0a78639 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -16,7 +16,6 @@ CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -56,8 +55,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_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 163e565..d850b4e 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -11,7 +11,6 @@ CONFIG_HAVE_VGA_BIOS=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -60,9 +59,9 @@ 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_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index c2df7ae..74bf6f0 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -9,7 +9,6 @@ CONFIG_HAVE_VGA_BIOS=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set @@ -52,9 +51,9 @@ 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_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 1296229..5e41aea 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -14,7 +14,6 @@ CONFIG_VIDEO=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index d0fdc91..779de99 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -16,7 +16,6 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -64,8 +63,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_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index dc41207..7e720a4 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -15,7 +15,6 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -63,8 +62,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_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 7c1f588..7d06350 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_COREBOOT=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index baf69d8..7b53184 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -9,7 +9,6 @@ CONFIG_HAVE_VGA_BIOS=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_FIT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -50,7 +49,7 @@ 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_USE_PRIVATE_LIBGCC=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index dd4ca36..28b9edc 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -15,7 +15,6 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -61,8 +60,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_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig index fbe7370..e81e15c 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,5 @@ 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_OF_LIBFDT=y diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig index b2a2655..17f3c2a 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,5 @@ 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_OF_LIBFDT=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index cd40d51..9acd83f 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 386a927..e720094 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -16,7 +16,6 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -60,8 +59,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_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index b0f89e1..855edcb 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -12,7 +12,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 776dfe8..3ba2ef7 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index e97e523..23d173c 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index ab5e937..de711c6 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 9fef12f..c9909d2 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 5a5986a..b331043 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 8bc6ca9..30774c4 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 42676eb..fd9096e 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 5915010..021711b 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -14,7 +14,6 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index cf43cad..4d4b85d 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -9,7 +9,6 @@ CONFIG_GENERATE_ACPI_TABLE=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -47,8 +46,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_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index 102c2f9..e55b285 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -6,7 +6,6 @@ CONFIG_MAX_CPUS=2 CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -44,10 +43,10 @@ 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_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..1c3138c 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -6,7 +6,6 @@ CONFIG_MAX_CPUS=2 CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -44,10 +43,10 @@ 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_USE_PRIVATE_LIBGCC=y CONFIG_EFI=y CONFIG_EFI_STUB=y diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 41bdd49..d52c94c 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -15,7 +15,6 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -58,8 +57,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_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index b0f5f1e..80bd31f 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -6,7 +6,6 @@ CONFIG_PRE_CON_BUF_ADDR=0x7c000000 CONFIG_VIDEO=y CONFIG_FIT=y CONFIG_BOOTDELAY=3 -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Matrix U-Boot> " diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index ea0b772..7bb823b 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -15,7 +15,6 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -58,8 +57,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_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index d45cb6e..51deddc 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -49,5 +49,5 @@ 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 diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig index fb89510..9c7a79f 100644 --- a/configs/theadorable_defconfig +++ b/configs/theadorable_defconfig @@ -39,7 +39,7 @@ 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_REGEX=y CONFIG_LIB_RAND=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index de6f419..c70f6a1 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -471,6 +471,16 @@ config CFB_CONSOLE_ANSI erase functions and limited graphics rendition control). Normal output from U-Boot will pass through this filter.
+config VGA_AS_SINGLE_DEVICE + bool "Set the video as an output-only device" + depends on CFB_CONSOLE + default y + help + If enable the framebuffer device will be initialized as an + output-only device. The Keyboard driver will not be set up. This + may be used if you have no keyboard device, or more than one + (USB Keyboard, AT Keyboard). + config VIDEO_CT69000 bool "Enable Chips & Technologies 69000 video driver" depends on VIDEO diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 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 501411b..0fc3131 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -344,7 +344,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 54dbe4c..2b3cf19 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 47a3002..6770bd0 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -225,7 +225,6 @@ */ #define CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_CMD_BMP
/* diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 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 58446b5..d812e66 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -360,7 +360,6 @@ #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 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 c9ca034..8002796 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -232,7 +232,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 d81dc21..1c7b839 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -298,7 +298,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 2621cf4..909aef1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8273,7 +8273,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