diff options
author | Nico Huber <nico.huber@secunet.com> | 2017-05-22 15:58:03 +0200 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2017-06-08 14:58:29 +0200 |
commit | 2e7f6ccafc3e633ed9001b3c3863253ee0630429 (patch) | |
tree | f8e8ff0b026fe9adf97b7cdc135665044f614b5a /src/soc/intel/braswell/acpi.c | |
parent | d4ebeaf475dc1137f489f12ffa4e55d914238662 (diff) |
fsp/gop: Add running the GOP to the choice of gfx init
The new config choice is called RUN_FSP_GOP. Some things had to happen
on the road:
* Drop confusing config GOP_SUPPORT,
* Add HAVE_FSP_GOP to chipsets that support it,
* Make running the GOP an option for FSP2.0 by returning 0
in random VBT getters.
Change-Id: I92f88424004a4c0abf1f39cc02e2a146bddbcedf
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/19815
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/braswell/acpi.c')
-rw-r--r-- | src/soc/intel/braswell/acpi.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 0acb90ce7b..7a518167b3 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -482,15 +482,15 @@ unsigned long southcluster_write_acpi_tables(device_t device, current = acpi_write_hpet(device, current, rsdp); current = acpi_align_current(current); -#if CONFIG_GOP_SUPPORT - igd_opregion_t *opregion; + if (IS_ENABLED(CONFIG_RUN_FSP_GOP)) { + igd_opregion_t *opregion; - printk(BIOS_DEBUG, "ACPI: * IGD OpRegion\n"); - opregion = (igd_opregion_t *)current; - init_igd_opregion(opregion); - current += sizeof(igd_opregion_t); - current = acpi_align_current(current); -#endif + printk(BIOS_DEBUG, "ACPI: * IGD OpRegion\n"); + opregion = (igd_opregion_t *)current; + init_igd_opregion(opregion); + current += sizeof(igd_opregion_t); + current = acpi_align_current(current); + } ssdt2 = (acpi_header_t *)current; memset(ssdt2, 0, sizeof(acpi_header_t)); @@ -544,7 +544,6 @@ __attribute__((weak)) void acpi_create_serialio_ssdt(acpi_header_t *ssdt) { } -#if CONFIG_GOP_SUPPORT /* Reading VBT table from flash */ static void get_fsp_vbt(igd_opregion_t *opregion) { @@ -615,4 +614,3 @@ int init_igd_opregion(igd_opregion_t *opregion) return 0; } -#endif |