summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2020-12-28 15:20:06 -0600
committerMichael Niewöhner <foss@mniewoehner.de>2020-12-30 16:35:21 +0000
commit5cf4c87da70b11e0b9dcb2f7bcb31b537811ca86 (patch)
treeeda1e41ae2d40b71032b858e8788128eb07abfa7 /src/soc
parent142e6f5ecfcba4c1c2fd6b7e015cb215d16f34fc (diff)
soc/intel/common: Move gfx.asl to drivers/intel/gma
Adjust platform-level includes as needed. Change-Id: I376349ccddb95c166f0836ec1273bb8252c7c155 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48959 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/alderlake/acpi/southbridge.asl2
-rw-r--r--src/soc/intel/apollolake/acpi/southbridge.asl2
-rw-r--r--src/soc/intel/cannonlake/acpi/southbridge.asl2
-rw-r--r--src/soc/intel/common/block/acpi/acpi/gfx.asl6
-rw-r--r--src/soc/intel/elkhartlake/acpi/southbridge.asl2
-rw-r--r--src/soc/intel/icelake/acpi/southbridge.asl2
-rw-r--r--src/soc/intel/jasperlake/acpi/southbridge.asl2
-rw-r--r--src/soc/intel/tigerlake/acpi/southbridge.asl2
8 files changed, 7 insertions, 13 deletions
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 <soc/intel/common/block/acpi/acpi/gfx.asl>
+#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
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 <soc/intel/common/block/acpi/acpi/gfx.asl>
+#include <drivers/intel/gma/acpi/gfx.asl>
/* LPC */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
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 <soc/intel/common/block/acpi/acpi/gfx.asl>
+#include <drivers/intel/gma/acpi/gfx.asl>
/* LPC 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
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 <soc/intel/common/block/acpi/acpi/gfx.asl>
+#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
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 <soc/intel/common/block/acpi/acpi/gfx.asl>
+#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
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 <soc/intel/common/block/acpi/acpi/gfx.asl>
+#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>
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 <soc/intel/common/block/acpi/acpi/gfx.asl>
+#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */
#include <soc/intel/common/block/acpi/acpi/lpc.asl>