From patchwork Thu Sep 29 20:23:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 676760 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3slR2C6fQvz9sRZ for ; Fri, 30 Sep 2016 06:27:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=XwrGsVUr; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3FA58B3840; Thu, 29 Sep 2016 22:26:26 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lGmWZ-uO4fY2; Thu, 29 Sep 2016 22:26:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0A326B385D; Thu, 29 Sep 2016 22:26:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 711BBB3918 for ; Thu, 29 Sep 2016 22:24:28 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vNE0oRUlmewU for ; Thu, 29 Sep 2016 22:24:28 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-it0-f43.google.com (mail-it0-f43.google.com [209.85.214.43]) by theia.denx.de (Postfix) with ESMTPS id 13FD4B385D for ; Thu, 29 Sep 2016 22:24:14 +0200 (CEST) Received: by mail-it0-f43.google.com with SMTP id r192so6903744ita.0 for ; Thu, 29 Sep 2016 13:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=KnY78/yEqxw0Pi3GaYwelBb6iMzuGOm0d21dwT0atzc=; b=XwrGsVUrRi5k0tYrI6AIbRzeHXSTuSho6rHMucUzWMb5DvsHVeC5XTXcn5mcRR2gnA CzQHVSRH2FdT8GEYsgjooAj4SePSNK9IpYM3kwHxIpcA0BaiqrkJsUz+QmLk8c9T/Ew9 E7tnPKmlY2hIuynWPIYmiUVjj/m5IeFGGCyjn/47pr9VN9oX897hnd8kv2+izIfK6QTc Nhvq9oe4ElvZEJPfp+L8eRnIVtNktkyqa1T6oMfu+OvN912Bxj25VKEsy8uSbNhLdmFG wqs5XjYPSQAtJ1EB081xn9wO7Oun8is1O0CHbVcB7Qsn1jFDdl212BB22WrRebe09vYT LdeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=KnY78/yEqxw0Pi3GaYwelBb6iMzuGOm0d21dwT0atzc=; b=XN6HiAdHM6aGY4ZT+wdAMewPYv2KJ9FkRCT+E1JKSZ4GP9udovBercOruycAUs74dz 1c0tW81TGEcXJFOTlKcZ1N62KC9seN3nCCKTeme0tzoLOX0zjHWAFj9ygEcBgaa8Fh4o q3td9F57fqMDX5bUBKWIdOYZUvrhM2VkWQJIu54qKNH8Ph3smPjBEM1A94gPD9VPwByC Ariry4h9PC6ul8Ep2hBC4svuRbcc2erQR2YCrLtLAmdJEwm7Ihn4aGJsU9CGwqHwHWhh 4BhNXVnDZ8rlnhqM8epIUZQIeEydM47MaXS+IWISpkEBby/PDEAbFcyvYS/FrmEZPd1M 6XWA== X-Gm-Message-State: AA6/9RlSoAjHY6Gc9ZmKZhneps+mnaujuSAJhF46TDk78YahGuQMLhwWMfJkQ8Q/d12Whf2O X-Received: by 10.107.10.75 with SMTP id u72mr5840199ioi.22.1475180653034; Thu, 29 Sep 2016 13:24:13 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:12:1dc9:43d8:22a0:aa9d]) by smtp.gmail.com with ESMTPSA id g65sm5828792ioj.24.2016.09.29.13.24.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Sep 2016 13:24:12 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id B55ED220644; Thu, 29 Sep 2016 14:24:11 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 29 Sep 2016 14:23:15 -0600 Message-Id: <1475180609-14716-17-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1475180609-14716-1-git-send-email-sjg@chromium.org> References: <1475180609-14716-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v3 16/29] Convert CONFIG_VGA_AS_SINGLE_DEVICE to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Heiko Schocher Reviewed-by: Tom Rini --- Changes in v3: None Changes in v2: None configs/Chuwi_V7_CW0825_defconfig | 1 + configs/MSI_Primo81_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebox_panther_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/qemu-x86_efi_payload32_defconfig | 1 + configs/qemu-x86_efi_payload64_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + 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 - 76 files changed, 27 insertions(+), 70 deletions(-) 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 aa4bfe0..6de6c1e 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -58,4 +58,5 @@ CONFIG_USB_STORAGE=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 39b4f73..2f35b77 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -62,5 +62,6 @@ CONFIG_USB_STORAGE=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 4e24d60..0d5aaa7 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -54,5 +54,6 @@ CONFIG_USB_STORAGE=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 e869bff..513f3c4 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -66,4 +66,5 @@ CONFIG_USB_STORAGE=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 bbad68e..cc6385b 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -65,4 +65,5 @@ CONFIG_USB_STORAGE=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 5d90bd2..a1587ef 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -51,4 +51,5 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=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 3ae2aa5..3c6b94f 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -63,4 +63,5 @@ CONFIG_USB_STORAGE=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 fc38642..65da516 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -62,4 +62,5 @@ CONFIG_USB_STORAGE=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/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 9bbbcd9..9bd9c1d 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -49,4 +49,5 @@ CONFIG_USB_STORAGE=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 3dfc344..9374dde 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -46,6 +46,7 @@ CONFIG_USB_STORAGE=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 87afb73..85dc3e9 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -46,6 +46,7 @@ CONFIG_USB_STORAGE=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 355f97f..bbdcbc0 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -60,4 +60,5 @@ CONFIG_USB_STORAGE=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 b110798..44f7b7c 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -60,4 +60,5 @@ CONFIG_USB_STORAGE=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 2596d78..51deddc 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -50,3 +50,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 dc39c18..9c7a79f 100644 --- a/configs/theadorable_defconfig +++ b/configs/theadorable_defconfig @@ -40,5 +40,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 2150830..2c5ef2b 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -472,6 +472,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 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 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 d523af8..ded26f9 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -227,7 +227,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 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 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 fa3a7286..d3bc836 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -181,7 +181,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 a19f206..99a7979 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -451,7 +451,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 3913fcd..07031e5 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -201,7 +201,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 25ab0c9..00cbe63 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -371,7 +371,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 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 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 da75d03..bf0cb2e 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -256,7 +256,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 78333c6..3b9c688 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 06ac316..3bc1b09 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8267,7 +8267,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