mb/*/*{i82801gx}: Use sb/intel/common/acpi/platform.asl

Change-Id: Ifc0799d26394a525d764fb4ffc096b48060ee22f
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36579
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

16 files changed, 8 insertions, 232 deletions

diff --git a/src/mainboard/asrock/g41c-gs/acpi/platform.asl b/src/mainboard/asrock/g41c-gs/acpi/platform.asl
deleted file mode 100644
index 6c92a4ed47..0000000000
--- a/src/mainboard/asrock/g41c-gs/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice.  */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/asrock/g41c-gs/dsdt.asl b/src/mainboard/asrock/g41c-gs/dsdt.asl
index e0e3a3a94b..31e7c10d3e 100644
--- a/src/mainboard/asrock/g41c-gs/dsdt.asl
+++ b/src/mainboard/asrock/g41c-gs/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 )
 {
 	// global NVS and variables
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/asus/p5qpl-am/acpi/platform.asl b/src/mainboard/asus/p5qpl-am/acpi/platform.asl
deleted file mode 100644
index 6c92a4ed47..0000000000
--- a/src/mainboard/asus/p5qpl-am/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice.  */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/asus/p5qpl-am/dsdt.asl b/src/mainboard/asus/p5qpl-am/dsdt.asl
index e0e3a3a94b..31e7c10d3e 100644
--- a/src/mainboard/asus/p5qpl-am/dsdt.asl
+++ b/src/mainboard/asus/p5qpl-am/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 )
 {
 	// global NVS and variables
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/foxconn/d41s/acpi/platform.asl b/src/mainboard/foxconn/d41s/acpi/platform.asl
deleted file mode 100644
index 6c92a4ed47..0000000000
--- a/src/mainboard/foxconn/d41s/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice.  */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/foxconn/d41s/dsdt.asl b/src/mainboard/foxconn/d41s/dsdt.asl
index dc1dacc66b..e07ecc2801 100644
--- a/src/mainboard/foxconn/d41s/dsdt.asl
+++ b/src/mainboard/foxconn/d41s/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20090419	// OEM revision
 )
 {
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	#include <cpu/intel/speedstep/acpi/cpu.asl>
diff --git a/src/mainboard/foxconn/g41s-k/acpi/platform.asl b/src/mainboard/foxconn/g41s-k/acpi/platform.asl
deleted file mode 100644
index bda0df74b1..0000000000
--- a/src/mainboard/foxconn/g41s-k/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice. */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/foxconn/g41s-k/dsdt.asl b/src/mainboard/foxconn/g41s-k/dsdt.asl
index e0e3a3a94b..31e7c10d3e 100644
--- a/src/mainboard/foxconn/g41s-k/dsdt.asl
+++ b/src/mainboard/foxconn/g41s-k/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 )
 {
 	// global NVS and variables
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/acpi/platform.asl b/src/mainboard/gigabyte/ga-g41m-es2l/acpi/platform.asl
deleted file mode 100644
index 6c92a4ed47..0000000000
--- a/src/mainboard/gigabyte/ga-g41m-es2l/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice.  */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
index e0e3a3a94b..31e7c10d3e 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 )
 {
 	// global NVS and variables
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/intel/d510mo/acpi/platform.asl b/src/mainboard/intel/d510mo/acpi/platform.asl
deleted file mode 100644
index 6c92a4ed47..0000000000
--- a/src/mainboard/intel/d510mo/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice.  */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/intel/d510mo/dsdt.asl b/src/mainboard/intel/d510mo/dsdt.asl
index dc1dacc66b..e07ecc2801 100644
--- a/src/mainboard/intel/d510mo/dsdt.asl
+++ b/src/mainboard/intel/d510mo/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20090419	// OEM revision
 )
 {
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	#include <cpu/intel/speedstep/acpi/cpu.asl>
diff --git a/src/mainboard/intel/dg41wv/acpi/platform.asl b/src/mainboard/intel/dg41wv/acpi/platform.asl
deleted file mode 100644
index 6c92a4ed47..0000000000
--- a/src/mainboard/intel/dg41wv/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice.  */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/intel/dg41wv/dsdt.asl b/src/mainboard/intel/dg41wv/dsdt.asl
index e0e3a3a94b..31e7c10d3e 100644
--- a/src/mainboard/intel/dg41wv/dsdt.asl
+++ b/src/mainboard/intel/dg41wv/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 )
 {
 	// global NVS and variables
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/lenovo/thinkcentre_a58/acpi/platform.asl b/src/mainboard/lenovo/thinkcentre_a58/acpi/platform.asl
deleted file mode 100644
index 6c92a4ed47..0000000000
--- a/src/mainboard/lenovo/thinkcentre_a58/acpi/platform.asl
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2015 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-Method(_PIC, 1)
-{
-	/* Remember the OS' IRQ routing choice.  */
-	Store(Arg0, PICM)
-}
-
-/* SMI I/O Trap */
-Method(TRAP, 1, Serialized)
-{
-	Store (Arg0, SMIF)	/* SMI Function */
-	Store (0, TRP0)		/* Generate trap */
-	Return (SMIF)		/* Return value of SMI handler */
-}
diff --git a/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl b/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl
index e0e3a3a94b..31e7c10d3e 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl
+++ b/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 )
 {
 	// global NVS and variables
-	#include "acpi/platform.asl"
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
 
 	Scope (\_SB) {