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/sandybridge/Kconfig | 2 -- src/northbridge/intel/sandybridge/gma.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/northbridge/intel/sandybridge') diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig index 7c954fbbcb..1a47f0db7e 100644 --- a/src/northbridge/intel/sandybridge/Kconfig +++ b/src/northbridge/intel/sandybridge/Kconfig @@ -17,7 +17,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE bool select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE - select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION select CPU_INTEL_MODEL_206AX select HAVE_DEBUG_RAM_SETUP select INTEL_GMA_ACPI @@ -26,7 +25,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE config NORTHBRIDGE_INTEL_IVYBRIDGE bool select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE - select NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION select CPU_INTEL_MODEL_306AX select HAVE_DEBUG_RAM_SETUP select INTEL_GMA_ACPI diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index db24ddac5f..2751b3a0ea 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "chip.h" @@ -698,7 +698,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