From d4ebeaf475dc1137f489f12ffa4e55d914238662 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Mon, 22 May 2017 13:49:22 +0200 Subject: device/Kconfig: Put gfx init methods into a `choice` Provide all gfx init methods as a Kconfig `choice`. This elimates the option to select native gfx init along with running a Video BIOS. It's been only theoretically useful in one corner case: Hybrid graphics where only one controller is supported by native gfx init. Though I suppose in that case it's fair to assume that one would use SeaBIOS to run the VBIOS. For the case that we want the payload to initialize graphics or no pre-boot graphics at all, the new symbol NO_GFX_INIT was added to the choice. If multiple options are available, the default is chosen as follows: * NO_GFX_INIT, if we add a Video BIOS and the payload is SeaBIOS, * VGA_ROM_RUN, if we add a Video BIOS and the payload is not SeaBIOS, * NATIVE_VGA_INIT, if we don't add a Video BIOS. As a side effect, libgfxinit is now an independent choice. Change-Id: I06bc65ecf3724f299f59888a97219fdbd3d2d08b Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/19814 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/asus/kfsn4-dre/Kconfig | 4 ---- src/mainboard/asus/kfsn4-dre_k8/Kconfig | 4 ---- src/mainboard/google/slippy/Kconfig | 1 - src/mainboard/sapphire/pureplatinumh61/Kconfig | 1 - 4 files changed, 10 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/asus/kfsn4-dre/Kconfig b/src/mainboard/asus/kfsn4-dre/Kconfig index 0920056841..3e9f3f35e3 100644 --- a/src/mainboard/asus/kfsn4-dre/Kconfig +++ b/src/mainboard/asus/kfsn4-dre/Kconfig @@ -81,10 +81,6 @@ config ONBOARD_VGA_IS_PRIMARY bool default y -config MAINBOARD_DO_NATIVE_VGA_INIT - bool - default y - config MAINBOARD_POWER_ON_AFTER_POWER_FAIL bool default y diff --git a/src/mainboard/asus/kfsn4-dre_k8/Kconfig b/src/mainboard/asus/kfsn4-dre_k8/Kconfig index 8bd2146d95..0d13a4ece4 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/Kconfig +++ b/src/mainboard/asus/kfsn4-dre_k8/Kconfig @@ -87,10 +87,6 @@ config ONBOARD_VGA_IS_PRIMARY bool default y -config MAINBOARD_DO_NATIVE_VGA_INIT - bool - default y - config MAINBOARD_POWER_ON_AFTER_POWER_FAIL bool default y diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 1d889df97e..e24e2f74f7 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -15,7 +15,6 @@ config BOARD_GOOGLE_BASEBOARD_SLIPPY select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_USE_LIBGFXINIT if MAINBOARD_DO_NATIVE_VGA_INIT if BOARD_GOOGLE_BASEBOARD_SLIPPY diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig index f9458a62a3..6ade9b5d29 100644 --- a/src/mainboard/sapphire/pureplatinumh61/Kconfig +++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_USE_LIBGFXINIT if MAINBOARD_DO_NATIVE_VGA_INIT select INTEL_INT15 select UDELAY_TSC select SERIRQ_CONTINUOUS_MODE -- cgit v1.2.3