Kconfig: Rework MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
* Rename it to HAVE_VGA_TEXT_FRAMEBUFFER. * Let drivers select it if they are in charge. * Don't select it on the mainboard level if a driver handles it. Change-Id: I2d9d09be9aa6d019e77460e69a245ad2d8cda4ea Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/19791 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
41807626e2
commit
ce642f08b9
|
@ -21,7 +21,7 @@ config MAINBOARD_HAS_NATIVE_VGA_INIT
|
|||
bool
|
||||
default n
|
||||
|
||||
config MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
config HAVE_VGA_TEXT_FRAMEBUFFER
|
||||
bool
|
||||
default n
|
||||
|
||||
|
@ -47,7 +47,7 @@ config MAINBOARD_USE_LIBGFXINIT
|
|||
bool "Use libgfxinit for native graphics initialization"
|
||||
depends on MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
depends on MAINBOARD_HAS_LIBGFXINIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER
|
||||
select RAMSTAGE_LIBHWBASE
|
||||
select VGA if !FRAMEBUFFER_KEEP_VESA_MODE
|
||||
select NO_EDID_FILL_FB
|
||||
|
@ -62,6 +62,7 @@ config VGA_ROM_RUN
|
|||
default n if PAYLOAD_SEABIOS
|
||||
default y if !PAYLOAD_SEABIOS
|
||||
depends on PCI && !MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER
|
||||
help
|
||||
Execute VGA Option ROMs in coreboot if found. This is required
|
||||
to enable PCI/AGP/PCI-E video cards when not using a SeaBIOS
|
||||
|
@ -526,7 +527,7 @@ config FRAMEBUFFER_VESA_MODE
|
|||
config FRAMEBUFFER_KEEP_VESA_MODE
|
||||
prompt "Keep VESA framebuffer"
|
||||
bool
|
||||
depends on PCI_OPTION_ROM_RUN_YABEL || PCI_OPTION_ROM_RUN_REALMODE || (MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG && MAINBOARD_DO_NATIVE_VGA_INIT)
|
||||
depends on HAVE_VGA_TEXT_FRAMEBUFFER
|
||||
help
|
||||
This option keeps the framebuffer mode set after coreboot finishes
|
||||
execution. If this option is enabled, coreboot will pass a
|
||||
|
|
|
@ -3,6 +3,7 @@ config DRIVERS_EMULATION_QEMU_BOCHS
|
|||
default y
|
||||
depends on BOARD_EMULATION_QEMU_X86
|
||||
depends on MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER
|
||||
select VGA
|
||||
help
|
||||
VGA driver for qemu emulated vga cards supporting
|
||||
|
|
|
@ -2,3 +2,5 @@ config DRIVERS_XGI_Z79_COMMON
|
|||
bool
|
||||
select VGA
|
||||
select NO_EDID_FILL_FB
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
|
|
|
@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_ACPI_RESUME
|
||||
select USE_OPTION_TABLE
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select VGA
|
||||
|
||||
config MAINBOARD_DIR
|
||||
|
|
|
@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select BOARD_ROMSIZE_KB_1024
|
||||
select INTEL_EDID
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select PCIEXP_ASPM
|
||||
select PCIEXP_CLK_PM
|
||||
select PCIEXP_L1_SUB_STATE
|
||||
|
|
|
@ -20,9 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select ENABLE_APIC_EXT_ID
|
||||
select DRIVERS_I2C_W83793
|
||||
select DRIVERS_XGI_Z9S
|
||||
select VGA
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
config MAINBOARD_DIR
|
||||
string
|
||||
|
|
|
@ -22,9 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select K8_ALLOCATE_IO_RANGE
|
||||
select DRIVERS_I2C_W83793
|
||||
select DRIVERS_XGI_Z9S
|
||||
select VGA
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
config MAINBOARD_DIR
|
||||
string
|
||||
|
|
|
@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select BOARD_ROMSIZE_KB_256
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
config MAINBOARD_DIR
|
||||
string
|
||||
|
|
|
@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select BOARD_ROMSIZE_KB_2048
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
config MAINBOARD_DIR
|
||||
string
|
||||
|
|
|
@ -35,7 +35,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select CHANNEL_XOR_RANDOMIZATION
|
||||
select VGA
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select INTEL_INT15
|
||||
|
||||
config MAINBOARD_DIR
|
||||
|
|
|
@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select BOARD_ROMSIZE_KB_1024
|
||||
select INTEL_EDID
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select PCIEXP_ASPM
|
||||
select PCIEXP_CLK_PM
|
||||
select PCIEXP_L1_SUB_STATE
|
||||
|
|
|
@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_CMOS_DEFAULT
|
||||
select HAVE_ACPI_RESUME
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select INTEL_INT15
|
||||
select SUPERIO_NSC_PC87382
|
||||
select SUPERIO_NSC_PC87384
|
||||
|
|
|
@ -20,8 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select USE_NATIVE_RAMINIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select ENABLE_VMX
|
||||
select DRIVERS_LENOVO_HYBRID_GRAPHICS
|
||||
|
||||
|
|
|
@ -15,8 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_OPTION_TABLE
|
||||
select HAVE_CMOS_DEFAULT
|
||||
select HAVE_ACPI_RESUME
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select INTEL_INT15
|
||||
select SANDYBRIDGE_IVYBRIDGE_LVDS
|
||||
select ENABLE_VMX
|
||||
|
|
|
@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_ACPI_TABLES
|
||||
select HAVE_ACPI_RESUME
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select H8_DOCK_EARLY_INIT
|
||||
select HAVE_CMOS_DEFAULT
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_CMOS_DEFAULT
|
||||
select HAVE_ACPI_RESUME
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select INTEL_INT15
|
||||
select SUPERIO_NSC_PC87382
|
||||
select DRIVERS_LENOVO_WACOM
|
||||
|
|
|
@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select INTEL_INT15
|
||||
select HAVE_ACPI_RESUME
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select SUPERIO_NSC_PC87382
|
||||
select DRIVERS_LENOVO_WACOM
|
||||
select MAINBOARD_HAS_LPC_TPM
|
||||
|
|
|
@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_ACPI_RESUME
|
||||
select USE_OPTION_TABLE
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
select H8_DOCK_EARLY_INIT
|
||||
select DRIVERS_LENOVO_WACOM
|
||||
|
||||
|
|
|
@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select INTEL_INT15
|
||||
select EC_ACPI
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
config MAINBOARD_DIR
|
||||
string
|
||||
|
|
|
@ -26,6 +26,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
|||
select INTEL_GMA_ACPI
|
||||
select INTEL_GMA_SSC_ALTERNATE_REF
|
||||
select RELOCATABLE_RAMSTAGE
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
|
||||
config CBFS_SIZE
|
||||
hex
|
||||
|
|
|
@ -27,6 +27,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
|||
select INTEL_GMA_SSC_ALTERNATE_REF
|
||||
select RELOCATABLE_RAMSTAGE
|
||||
select INTEL_EDID
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
|
||||
config NORTHBRIDGE_INTEL_SUBTYPE_I945GC
|
||||
def_bool n
|
||||
|
|
|
@ -22,6 +22,7 @@ config NORTHBRIDGE_INTEL_NEHALEM
|
|||
select INTEL_GMA_ACPI
|
||||
select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE
|
||||
select ACPI_HUGE_LOWMEM_BACKUP
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
|
||||
if NORTHBRIDGE_INTEL_NEHALEM
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
|||
select LAPIC_MONOTONIC_TIMER
|
||||
select VGA
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
select RELOCATABLE_RAMSTAGE
|
||||
|
||||
config MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
|
|
|
@ -58,12 +58,11 @@ config SANDYBRIDGE_IVYBRIDGE_LVDS
|
|||
def_bool n
|
||||
select VGA
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
# Select VGA & INTEL_EDID if MAINBOARD_DO_NATIVE_VGA_INIT is enabled.
|
||||
config MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
select VGA
|
||||
select INTEL_EDID
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER
|
||||
|
||||
config MRC_CACHE_SIZE
|
||||
hex
|
||||
|
|
|
@ -25,6 +25,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
|||
select VGA
|
||||
select INTEL_GMA_ACPI
|
||||
select RELOCATABLE_RAMSTAGE
|
||||
select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
|
||||
config CBFS_SIZE
|
||||
hex
|
||||
|
|
Loading…
Reference in New Issue