From 09f06056eb7f2f1f966cf0e8942c42edb8a066a4 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Tue, 5 Jan 2021 20:30:16 +0100 Subject: soc/intel: Include gfx.asl from northbridge The iGPU is on the northbridge or system agent, not the southbridge. Change-Id: Ic63a7ad532fd1faa8e90d44bf7269040fa901757 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/49123 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Paul Menzel Reviewed-by: Tim Wawrzynczak --- src/soc/intel/alderlake/acpi/southbridge.asl | 3 --- src/soc/intel/apollolake/acpi/northbridge.asl | 3 +++ src/soc/intel/apollolake/acpi/southbridge.asl | 3 --- src/soc/intel/cannonlake/acpi/southbridge.asl | 3 --- src/soc/intel/common/block/acpi/acpi/northbridge.asl | 3 +++ src/soc/intel/elkhartlake/acpi/southbridge.asl | 3 --- src/soc/intel/icelake/acpi/southbridge.asl | 3 --- src/soc/intel/jasperlake/acpi/southbridge.asl | 3 --- src/soc/intel/skylake/acpi/pch.asl | 3 --- src/soc/intel/skylake/acpi/systemagent.asl | 3 +++ src/soc/intel/tigerlake/acpi/southbridge.asl | 3 --- 11 files changed, 9 insertions(+), 24 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/alderlake/acpi/southbridge.asl b/src/soc/intel/alderlake/acpi/southbridge.asl index 744b7ef50a..3a53f2c9d1 100644 --- a/src/soc/intel/alderlake/acpi/southbridge.asl +++ b/src/soc/intel/alderlake/acpi/southbridge.asl @@ -17,9 +17,6 @@ /* GPIO controller */ #include "gpio.asl" -/* GFX 00:02.0 */ -#include - /* ESPI 0:1f.0 */ #include diff --git a/src/soc/intel/apollolake/acpi/northbridge.asl b/src/soc/intel/apollolake/acpi/northbridge.asl index 1450983654..6a71900e7f 100644 --- a/src/soc/intel/apollolake/acpi/northbridge.asl +++ b/src/soc/intel/apollolake/acpi/northbridge.asl @@ -114,3 +114,6 @@ Method (_CRS, 0, Serialized) Return (MCRS) } + +/* GFX 00:02.0 */ +#include diff --git a/src/soc/intel/apollolake/acpi/southbridge.asl b/src/soc/intel/apollolake/acpi/southbridge.asl index 4d4e4dc6fe..f4d1497223 100644 --- a/src/soc/intel/apollolake/acpi/southbridge.asl +++ b/src/soc/intel/apollolake/acpi/southbridge.asl @@ -17,9 +17,6 @@ #include "xhci.asl" -/* GFX 00:02.0 */ -#include - /* LPC */ #include diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index f091d8f500..01c22508c2 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -16,9 +16,6 @@ #include "gpio.asl" #endif -/* GFX 00:02.0 */ -#include - /* LPC 0:1f.0 */ #include diff --git a/src/soc/intel/common/block/acpi/acpi/northbridge.asl b/src/soc/intel/common/block/acpi/acpi/northbridge.asl index 5780f4c799..89495a9e45 100644 --- a/src/soc/intel/common/block/acpi/acpi/northbridge.asl +++ b/src/soc/intel/common/block/acpi/acpi/northbridge.asl @@ -309,3 +309,6 @@ Device (PDRC) Return (BUF0) } } + +/* GFX 00:02.0 */ +#include diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl index 02425c444b..ccad7760a3 100644 --- a/src/soc/intel/elkhartlake/acpi/southbridge.asl +++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl @@ -14,9 +14,6 @@ /* GPIO controller */ #include "gpio.asl" -/* GFX 00:02.0 */ -#include - /* ESPI 0:1f.0 */ #include diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl index 925f28f816..4abea7c6f9 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -17,9 +17,6 @@ /* GPIO controller */ #include "gpio.asl" -/* GFX 00:02.0 */ -#include - /* ESPI 0:1f.0 */ #include diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl index b97ec58f36..e623cc35a9 100644 --- a/src/soc/intel/jasperlake/acpi/southbridge.asl +++ b/src/soc/intel/jasperlake/acpi/southbridge.asl @@ -17,9 +17,6 @@ /* GPIO controller */ #include "gpio.asl" -/* GFX 00:02.0 */ -#include - /* ESPI 0:1f.0 */ #include diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl index d2e922c359..136e5c4186 100644 --- a/src/soc/intel/skylake/acpi/pch.asl +++ b/src/soc/intel/skylake/acpi/pch.asl @@ -66,8 +66,5 @@ Method (_OSC, 4) #include #endif -/* Integrated graphics 0:2.0 */ -#include - /* Intel Power Engine Plug-in */ #include diff --git a/src/soc/intel/skylake/acpi/systemagent.asl b/src/soc/intel/skylake/acpi/systemagent.asl index d1441c4322..709e1f78c5 100644 --- a/src/soc/intel/skylake/acpi/systemagent.asl +++ b/src/soc/intel/skylake/acpi/systemagent.asl @@ -322,3 +322,6 @@ Device (PDRC) Return (BUF0) } } + +/* Integrated graphics 0:2.0 */ +#include diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl index 744b7ef50a..3a53f2c9d1 100644 --- a/src/soc/intel/tigerlake/acpi/southbridge.asl +++ b/src/soc/intel/tigerlake/acpi/southbridge.asl @@ -17,9 +17,6 @@ /* GPIO controller */ #include "gpio.asl" -/* GFX 00:02.0 */ -#include - /* ESPI 0:1f.0 */ #include -- cgit v1.2.3