sb/intel/lynxpoint: Use sb/intel/common/platform.asl

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

7 files changed, 6 insertions, 59 deletions

diff --git a/src/mainboard/asrock/h81m-hds/dsdt.asl b/src/mainboard/asrock/h81m-hds/dsdt.asl
index 67088fd347..8c4d5b8d5d 100644
--- a/src/mainboard/asrock/h81m-hds/dsdt.asl
+++ b/src/mainboard/asrock/h81m-hds/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 )
 {
 	#include "acpi/platform.asl"
-	#include <southbridge/intel/lynxpoint/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/lynxpoint/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/beltino/acpi/platform.asl b/src/mainboard/google/beltino/acpi/platform.asl
index cbe0c6f3ca..54a9cd43e1 100644
--- a/src/mainboard/google/beltino/acpi/platform.asl
+++ b/src/mainboard/google/beltino/acpi/platform.asl
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <southbridge/intel/lynxpoint/acpi/platform.asl>
+#include <southbridge/intel/common/acpi/platform.asl>
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
  * entering a sleep state. The sleep state number is passed in Arg0
diff --git a/src/mainboard/google/slippy/acpi/platform.asl b/src/mainboard/google/slippy/acpi/platform.asl
index 10b0efb9ef..5b0d27657e 100644
--- a/src/mainboard/google/slippy/acpi/platform.asl
+++ b/src/mainboard/google/slippy/acpi/platform.asl
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <southbridge/intel/lynxpoint/acpi/platform.asl>
+#include <southbridge/intel/common/acpi/platform.asl>
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
  * entering a sleep state. The sleep state number is passed in Arg0
diff --git a/src/mainboard/intel/baskingridge/acpi/platform.asl b/src/mainboard/intel/baskingridge/acpi/platform.asl
index 4d610d5a6b..bb2d6f9e86 100644
--- a/src/mainboard/intel/baskingridge/acpi/platform.asl
+++ b/src/mainboard/intel/baskingridge/acpi/platform.asl
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <southbridge/intel/lynxpoint/acpi/platform.asl>
+#include <southbridge/intel/common/acpi/platform.asl>
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
  * entering a sleep state. The sleep state number is passed in Arg0
diff --git a/src/mainboard/lenovo/t440p/dsdt.asl b/src/mainboard/lenovo/t440p/dsdt.asl
index 82358aa990..69cd4160e6 100644
--- a/src/mainboard/lenovo/t440p/dsdt.asl
+++ b/src/mainboard/lenovo/t440p/dsdt.asl
@@ -32,7 +32,7 @@ DefinitionBlock(
 {
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/lynxpoint/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables. */
 	#include <southbridge/intel/lynxpoint/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/supermicro/x10slm-f/dsdt.asl b/src/mainboard/supermicro/x10slm-f/dsdt.asl
index 6ed19eee3a..57e9a864f5 100644
--- a/src/mainboard/supermicro/x10slm-f/dsdt.asl
+++ b/src/mainboard/supermicro/x10slm-f/dsdt.asl
@@ -19,7 +19,7 @@
 DefinitionBlock("dsdt.aml", "DSDT", 2, OEM_ID, ACPI_TABLE_CREATOR, 0x20181220)
 {
 	#include "acpi/platform.asl"
-	#include <southbridge/intel/lynxpoint/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/lynxpoint/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/southbridge/intel/lynxpoint/acpi/platform.asl b/src/southbridge/intel/lynxpoint/acpi/platform.asl
deleted file mode 100644
index e37066887b..0000000000
--- a/src/southbridge/intel/lynxpoint/acpi/platform.asl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011-2012 The Chromium OS Authors. All rights reserved.
- *
- * 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.
- */
-
-/* The APM port can be used for generating software SMIs */
-
-OperationRegion (APMP, SystemIO, 0xb2, 2)
-Field (APMP, ByteAcc, NoLock, Preserve)
-{
-	APMC, 8,	// APM command
-	APMS, 8		// APM status
-}
-
-
-/* Port 80 POST */
-
-OperationRegion (POST, SystemIO, 0x80, 1)
-Field (POST, ByteAcc, Lock, Preserve)
-{
-	DBG0, 8
-}
-
-/* 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
-}
-
-/* The _PIC method is called by the OS to choose between interrupt
- * routing via the i8259 interrupt controller or the APIC.
- *
- * _PIC is called with a parameter of 0 for i8259 configuration and
- * with a parameter of 1 for Local Apic/IOAPIC configuration.
- */
-
-Method(_PIC, 1)
-{
-	// Remember the OS' IRQ routing choice.
-	Store(Arg0, PICM)
-}