From 1e1a0fb23d0b6d80df6e3c939249eaf3bd0c42f2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 17 Oct 2016 20:12:49 -0600 Subject: Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig This converts the following to Kconfig: CONFIG_VGA_AS_SINGLE_DEVICE Once we migrate to driver model for video, we should be able to drop this option. Signed-off-by: Simon Glass diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig index 8507f73..a67038b 100644 --- a/configs/Chuwi_V7_CW0825_defconfig +++ b/configs/Chuwi_V7_CW0825_defconfig @@ -22,3 +22,4 @@ CONFIG_USB_MUSB_HOST=y CONFIG_VIDEO_LCD_SPI_CS="PA0" CONFIG_VIDEO_LCD_SPI_SCLK="PA1" CONFIG_VIDEO_LCD_SPI_MOSI="PA2" +CONFIG_CFB_CONSOLE=y diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index 8847271..e9d5be4 100644 --- a/configs/MSI_Primo81_defconfig +++ b/configs/MSI_Primo81_defconfig @@ -25,3 +25,4 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9" CONFIG_VIDEO_LCD_SPI_SCLK="PH10" CONFIG_VIDEO_LCD_SPI_MOSI="PH11" CONFIG_VIDEO_LCD_SPI_MISO="PH12" +CONFIG_CFB_CONSOLE=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index f8f5f5c..d176d52 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -57,4 +57,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index ce051de..86fc66b 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -61,5 +61,6 @@ CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y CONFIG_VIDEO_IVYBRIDGE_IGD=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index a13612c..7ce29fb 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -52,5 +52,6 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 6bee9c6..784270c 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -65,4 +65,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 76ff904..b5ef570 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -64,4 +64,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 7d25f43..5bd7493 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -50,4 +50,5 @@ CONFIG_USB_STORAGE=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 3931896..6dd1c39 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -62,4 +62,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 1446ab6..614dd57 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -61,4 +61,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 65c5d68..ef60fab 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -24,3 +24,4 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_CFB_CONSOLE_ANSI=y +# CONFIG_VGA_AS_SINGLE_DEVICE is not set diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 3921570..9a3a6f5 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -48,4 +48,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index dc3b9fa..296fee4 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_EFI=y CONFIG_EFI_STUB=y diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index e1b30ed..129d3ee 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_EFI=y CONFIG_EFI_STUB=y diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 9fc169d..715311f 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -59,4 +59,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 43dc2fa..4f33f62 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -59,4 +59,5 @@ CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CFB_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index 7130dc8..60f4486 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -52,3 +52,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_VIDEO_MVEBU=y +CONFIG_CFB_CONSOLE=y diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig index 52c49d0..24a0dbe 100644 --- a/configs/theadorable_defconfig +++ b/configs/theadorable_defconfig @@ -42,5 +42,6 @@ CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_VIDEO_MVEBU=y +CONFIG_CFB_CONSOLE=y CONFIG_REGEX=y CONFIG_LIB_RAND=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3999246..a842da6 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -493,6 +493,16 @@ config CFB_CONSOLE_ANSI erase functions and limited graphics rendition control). Normal output from U-Boot will pass through this filter. +config VGA_AS_SINGLE_DEVICE + bool "Set the video as an output-only device" + depends on CFB_CONSOLE + default y + help + If enable the framebuffer device will be initialized as an + output-only device. The Keyboard driver will not be set up. This + may be used if you have no keyboard device, or more than one + (USB Keyboard, AT Keyboard). + config VIDEO_CT69000 bool "Enable Chips & Technologies 69000 video driver" depends on VIDEO diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 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 11f16c5..3cc7f67 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -341,7 +341,6 @@ ************************************************************/ #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR #undef CONFIG_VIDEO_ONBOARD /************************************************************ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 50e30e2..949b807 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -507,7 +507,6 @@ #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index fdce09f..0e90783 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -279,7 +279,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index c0abd0e..034940a 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -466,7 +466,6 @@ #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 8eff79e..bd2e57e 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000) #define CONFIG_CMD_BMP #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index c4dc8da..3571836 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -379,7 +379,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #if defined(CONFIG_VIDEO) #define CONFIG_BIOSEMU #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE2_IO_VIRT diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index c4ff922..cf258de 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -380,7 +380,6 @@ #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) #define CONFIG_CMD_BMP #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS @@ -401,7 +400,6 @@ #define CONFIG_ATI_RADEON_FB #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET -#define CONFIG_VGA_AS_SINGLE_DEVICE #endif /* I2C */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index f43f221..5faeb90 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -301,7 +301,6 @@ ************************************************************/ #define CONFIG_VIDEO_LOGO #define CONFIG_CONSOLE_EXTRA_INFO -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VIDEO_ONBOARD /* Video controller is on-board */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index b5f1712..893155d 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -504,7 +504,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 3d221e3..9bed457 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -510,7 +510,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index ca87180..e82ef89 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -414,7 +414,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 50ca2d7..35019d7 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -526,7 +526,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x180000) #define CONFIG_CMD_BMP #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index cc8d2cd..da8fb55 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -107,7 +107,6 @@ #define CONFIG_VIDEO_BMP_LOGO #endif -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #endif /* #ifndef CONFIG_TQM5200S */ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index bdff6db..2d1c099 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -31,10 +31,6 @@ #define CONFIG_SYS_TEXT_BASE 0xFFF00000 -#if defined(CONFIG_VIDEO) -#define CONFIG_VGA_AS_SINGLE_DEVICE -#endif - #define CONFIG_SYS_MPC512X_CLKIN 25000000 /* in Hz */ #define SCFR1_IPS_DIV 2 #define SCFR1_LPC_DIV 2 diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index db50a71..854c0c4 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -273,7 +273,6 @@ /* Framebuffer */ #define CONFIG_VIDEO_IPUV3 -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/aria.h b/include/configs/aria.h index ec13b58..b08e90c 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -38,10 +38,6 @@ /* video */ -#if defined(CONFIG_VIDEO) -#define CONFIG_VGA_AS_SINGLE_DEVICE -#endif - /* CONFIG_PCI is defined at config time */ #define CONFIG_SYS_MPC512X_CLKIN 33000000 /* in Hz */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 0ec5732..93083fc 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -231,7 +231,6 @@ /* Framebuffer */ #define CONFIG_VIDEO_IPUV3 /* check this console not needed, after test remove it */ -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 1c76b5e..b016f20 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -89,7 +89,6 @@ /* Framebuffer */ #define CONFIG_VIDEO_IPUV3 -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 767368c..3b55d20 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -255,7 +255,6 @@ #define CONFIG_VIDEO_IPUV3 #define CONFIG_IPUV3_CLK 260000000 #define CONFIG_IMX_HDMI -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 23b298d..3a4da86 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -225,7 +225,6 @@ #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 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 5e1a86b..f62dba4 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -80,7 +80,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index d3ca706..8c35688 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 57eec0c..44155e7 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -309,7 +309,6 @@ /* Framebuffer */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index c0dadd0..83a1453 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -179,7 +179,6 @@ /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 260000000 #define CONFIG_CMD_HDMIDETECT diff --git a/include/configs/icon.h b/include/configs/icon.h index 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 ece3d45..f8dcf29 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -181,7 +181,6 @@ #define CONFIG_VIDEO_MX3 #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SPLASH_SCREEN #define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 447190a..d7a52a0 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -50,7 +50,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_CONSOLE_EXTRA_INFO -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_GZIP diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 93c7864..eb4d037 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -445,7 +445,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_FSL_DCU_FB #define CONFIG_CMD_BMP -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8da01dd..dd95a67 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -327,7 +327,6 @@ #ifdef CONFIG_FSL_DCU_FB #define CONFIG_CMD_BMP -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 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 2fa56d6..7e05bfd 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -199,7 +199,6 @@ */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/mcx.h b/include/configs/mcx.h index d113ec4..b9a2ad3 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -365,7 +365,6 @@ #define CONFIG_NET_RETRY_COUNT 10 #endif -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_CMD_BMP diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index ddf6c7c..0181887 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100) #define CONFIG_CMD_BMP #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 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 e02decb..664e2dd 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -94,7 +94,6 @@ /* Framebuffer and LCD */ #define CONFIG_PREBOOT #define CONFIG_VIDEO_IPUV3 -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index f5ee433..2ee6d98 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -214,7 +214,6 @@ /* Framebuffer and LCD */ #define CONFIG_PREBOOT #define CONFIG_VIDEO_IPUV3 -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 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 fb380ba..9a0b0a2 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 5354f4b..0cead00 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -229,7 +229,6 @@ #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index c7715a0..978b4fa 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -254,7 +254,6 @@ #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 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 efb312f..eca984a 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -40,7 +40,6 @@ /* Video */ #if defined(CONFIG_VIDEO) -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 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 ad32b91..2328c78 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -175,7 +175,6 @@ #define CONFIG_CONSOLE_EXTRA_INFO #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_SW_CURSOR #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_GZIP diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index c95efd9..239f84a 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -296,7 +296,6 @@ extern int soft_i2c_gpio_scl; /* allow both serial and cfb console. */ /* stop x86 thinking in cfbconsole from trying to init a pc keyboard */ -#define CONFIG_VGA_AS_SINGLE_DEVICE #endif /* CONFIG_VIDEO */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index f77e88e..cf4134f 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -77,7 +77,6 @@ #define CONFIG_VIDEO_IPUV3 #define CONFIG_IPUV3_CLK 260000000 #define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 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 ab0ca15..d089b53 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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 767a631..df489f4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8251,7 +8251,6 @@ CONFIG_VERY_BIG_RAM CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP CONFIG_VF610 -CONFIG_VGA_AS_SINGLE_DEVICE CONFIG_VID CONFIG_VIDEO_BCM2835 CONFIG_VIDEO_BMP_GZIP -- cgit v0.10.2