From 5cf4c87da70b11e0b9dcb2f7bcb31b537811ca86 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Mon, 28 Dec 2020 15:20:06 -0600 Subject: soc/intel/common: Move gfx.asl to drivers/intel/gma MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust platform-level includes as needed. Change-Id: I376349ccddb95c166f0836ec1273bb8252c7c155 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/48959 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/drivers/intel/gma/acpi/gfx.asl | 6 ++++++ src/soc/intel/alderlake/acpi/southbridge.asl | 2 +- src/soc/intel/apollolake/acpi/southbridge.asl | 2 +- src/soc/intel/cannonlake/acpi/southbridge.asl | 2 +- src/soc/intel/common/block/acpi/acpi/gfx.asl | 6 ------ src/soc/intel/elkhartlake/acpi/southbridge.asl | 2 +- src/soc/intel/icelake/acpi/southbridge.asl | 2 +- src/soc/intel/jasperlake/acpi/southbridge.asl | 2 +- src/soc/intel/tigerlake/acpi/southbridge.asl | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 src/drivers/intel/gma/acpi/gfx.asl delete mode 100644 src/soc/intel/common/block/acpi/acpi/gfx.asl (limited to 'src') diff --git a/src/drivers/intel/gma/acpi/gfx.asl b/src/drivers/intel/gma/acpi/gfx.asl new file mode 100644 index 0000000000..109543fd6f --- /dev/null +++ b/src/drivers/intel/gma/acpi/gfx.asl @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +Device (GFX0) +{ + Name (_ADR, 0x00020000) +} diff --git a/src/soc/intel/alderlake/acpi/southbridge.asl b/src/soc/intel/alderlake/acpi/southbridge.asl index 3d8e55490a..744b7ef50a 100644 --- a/src/soc/intel/alderlake/acpi/southbridge.asl +++ b/src/soc/intel/alderlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl" /* GFX 00:02.0 */ -#include +#include /* ESPI 0:1f.0 */ #include diff --git a/src/soc/intel/apollolake/acpi/southbridge.asl b/src/soc/intel/apollolake/acpi/southbridge.asl index 4a8be47c51..4d4e4dc6fe 100644 --- a/src/soc/intel/apollolake/acpi/southbridge.asl +++ b/src/soc/intel/apollolake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "xhci.asl" /* GFX 00:02.0 */ -#include +#include /* LPC */ #include diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index fafbbfdcda..f091d8f500 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -17,7 +17,7 @@ #endif /* GFX 00:02.0 */ -#include +#include /* LPC 0:1f.0 */ #include diff --git a/src/soc/intel/common/block/acpi/acpi/gfx.asl b/src/soc/intel/common/block/acpi/acpi/gfx.asl deleted file mode 100644 index 109543fd6f..0000000000 --- a/src/soc/intel/common/block/acpi/acpi/gfx.asl +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -Device (GFX0) -{ - Name (_ADR, 0x00020000) -} diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl index 17d19131b5..02425c444b 100644 --- a/src/soc/intel/elkhartlake/acpi/southbridge.asl +++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl @@ -15,7 +15,7 @@ #include "gpio.asl" /* GFX 00:02.0 */ -#include +#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 129a88da8c..925f28f816 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl" /* GFX 00:02.0 */ -#include +#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 ebc6fd8443..b97ec58f36 100644 --- a/src/soc/intel/jasperlake/acpi/southbridge.asl +++ b/src/soc/intel/jasperlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl" /* GFX 00:02.0 */ -#include +#include /* ESPI 0:1f.0 */ #include diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl index 3d8e55490a..744b7ef50a 100644 --- a/src/soc/intel/tigerlake/acpi/southbridge.asl +++ b/src/soc/intel/tigerlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl" /* GFX 00:02.0 */ -#include +#include /* ESPI 0:1f.0 */ #include -- cgit v1.2.3