From 6577ec4de4290d3adbf5fbdc31b09b38c09100cf Mon Sep 17 00:00:00 2001
From: Subrata Banik <subrata.banik@intel.com>
Date: Sat, 3 Oct 2020 23:07:36 +0530
Subject: soc/intel/common/block/acpi: Factor out common platform.asl

This patch moves platform.asl into common block acpi directory to
avoid duplicating the same ASL code block across SoC directory.

TEST=Able to build and boot TGL, CNL and CML platform.
1) Dump and disassemble DSDT, verify _PIC method present inside
common platform.asl is still there.
2) Verify no ACPI error seen while running 'dmesg` from console.

Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Change-Id: I5189b03d6abfaec39882d28b40a9bfa002128be3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45982
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/mainboard/intel/cannonlake_rvp/dsdt.asl | 2 +-
 src/mainboard/intel/coffeelake_rvp/dsdt.asl | 2 +-
 src/mainboard/intel/icelake_rvp/dsdt.asl    | 2 +-
 src/mainboard/intel/jasperlake_rvp/dsdt.asl | 2 +-
 src/mainboard/intel/kblrvp/dsdt.asl         | 2 +-
 src/mainboard/intel/kunimitsu/dsdt.asl      | 2 +-
 src/mainboard/intel/saddlebrook/dsdt.asl    | 2 +-
 src/mainboard/intel/tglrvp/dsdt.asl         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mainboard/intel')

diff --git a/src/mainboard/intel/cannonlake_rvp/dsdt.asl b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
index 5a06a45ddd..280844d64a 100644
--- a/src/mainboard/intel/cannonlake_rvp/dsdt.asl
+++ b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/coffeelake_rvp/dsdt.asl b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
index 121012e888..5dd84cf8e5 100644
--- a/src/mainboard/intel/coffeelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/cannonlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl
index a3c93e2c5f..41a9c0ae52 100644
--- a/src/mainboard/intel/icelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/icelake_rvp/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/icelake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/jasperlake_rvp/dsdt.asl b/src/mainboard/intel/jasperlake_rvp/dsdt.asl
index be883b4c25..ce781e277d 100644
--- a/src/mainboard/intel/jasperlake_rvp/dsdt.asl
+++ b/src/mainboard/intel/jasperlake_rvp/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/jasperlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl
index 354f488736..6eee06a9a1 100644
--- a/src/mainboard/intel/kblrvp/dsdt.asl
+++ b/src/mainboard/intel/kblrvp/dsdt.asl
@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl
index 90a559471a..71595773bd 100644
--- a/src/mainboard/intel/kunimitsu/dsdt.asl
+++ b/src/mainboard/intel/kunimitsu/dsdt.asl
@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/saddlebrook/dsdt.asl b/src/mainboard/intel/saddlebrook/dsdt.asl
index f705b5488c..d8690764bf 100644
--- a/src/mainboard/intel/saddlebrook/dsdt.asl
+++ b/src/mainboard/intel/saddlebrook/dsdt.asl
@@ -10,7 +10,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <soc/intel/skylake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <soc/intel/skylake/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl
index e5323ef3b9..5cde1de7c8 100644
--- a/src/mainboard/intel/tglrvp/dsdt.asl
+++ b/src/mainboard/intel/tglrvp/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	0x20110725	/* OEM revision */
 )
 {
-	#include <soc/intel/tigerlake/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
-- 
cgit v1.2.3