From ebe08e0ee3dffad30abffac04f95c7579ec11a30 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 14 Jul 2017 13:28:42 -0500 Subject: drivers/intel/gma/opregion: migrate from nb/common Migrate opregion code from northbridge/intel/common to drivers/intel/gma in preparation for consolidation with soc/intel/common opregion code. Rename init_igd_opregion() for clarity and disambiguation with other implementations. Change-Id: I2d0bae98f04dbe7e896ca34e15f24d29b6aa2ed6 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/20582 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/northbridge/intel/haswell/Kconfig | 1 - src/northbridge/intel/haswell/gma.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/northbridge/intel/haswell') diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig index 90f877499b..d5dec53041 100644 --- a/src/northbridge/intel/haswell/Kconfig +++ b/src/northbridge/intel/haswell/Kconfig @@ -17,7 +17,6 @@ config NORTHBRIDGE_INTEL_HASWELL bool select CPU_INTEL_HASWELL select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE - select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION select INTEL_DDI select INTEL_GMA_ACPI select RELOCATABLE_RAMSTAGE diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index 4baea7071d..a7b61e2ec9 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -534,7 +534,7 @@ gma_write_acpi_tables(struct device *const dev, igd_opregion_t *opregion = (igd_opregion_t *)current; global_nvs_t *gnvs; - if (init_igd_opregion(opregion) != CB_SUCCESS) + if (intel_gma_init_igd_opregion(opregion) != CB_SUCCESS) return current; current += sizeof(igd_opregion_t); -- cgit v1.2.3