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

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

47 files changed, 46 insertions, 99 deletions

diff --git a/src/mainboard/apple/macbookair4_2/dsdt.asl b/src/mainboard/apple/macbookair4_2/dsdt.asl
index 641b951bb5..91e0b2087f 100644
--- a/src/mainboard/apple/macbookair4_2/dsdt.asl
+++ b/src/mainboard/apple/macbookair4_2/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/asrock/b75pro3-m/dsdt.asl b/src/mainboard/asrock/b75pro3-m/dsdt.asl
index 00256267f7..e1b28db377 100644
--- a/src/mainboard/asrock/b75pro3-m/dsdt.asl
+++ b/src/mainboard/asrock/b75pro3-m/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/asus/h61m-cs/dsdt.asl b/src/mainboard/asus/h61m-cs/dsdt.asl
index 0e1cc3abcf..dc7a3674ae 100644
--- a/src/mainboard/asus/h61m-cs/dsdt.asl
+++ b/src/mainboard/asus/h61m-cs/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl
index c5f92e27f8..0cdc58c0ef 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl
+++ b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl
@@ -26,7 +26,7 @@ DefinitionBlock(
 {
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
diff --git a/src/mainboard/asus/p8h61-m_lx/dsdt.asl b/src/mainboard/asus/p8h61-m_lx/dsdt.asl
index c5f92e27f8..0cdc58c0ef 100644
--- a/src/mainboard/asus/p8h61-m_lx/dsdt.asl
+++ b/src/mainboard/asus/p8h61-m_lx/dsdt.asl
@@ -26,7 +26,7 @@ DefinitionBlock(
 {
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
diff --git a/src/mainboard/asus/p8h61-m_pro/dsdt.asl b/src/mainboard/asus/p8h61-m_pro/dsdt.asl
index 4b48e1fd53..c2b46f333b 100644
--- a/src/mainboard/asus/p8h61-m_pro/dsdt.asl
+++ b/src/mainboard/asus/p8h61-m_pro/dsdt.asl
@@ -28,7 +28,7 @@ DefinitionBlock(
 	#include "acpi/platform.asl"
 	#include "acpi/superio.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
diff --git a/src/mainboard/asus/p8z77-m_pro/dsdt.asl b/src/mainboard/asus/p8z77-m_pro/dsdt.asl
index 1c7a620ee2..62d44eabe9 100644
--- a/src/mainboard/asus/p8z77-m_pro/dsdt.asl
+++ b/src/mainboard/asus/p8z77-m_pro/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	#include "acpi/platform.asl"
 	#include "acpi/superio.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/compulab/intense_pc/dsdt.asl b/src/mainboard/compulab/intense_pc/dsdt.asl
index 97df937f00..4e4351670b 100644
--- a/src/mainboard/compulab/intense_pc/dsdt.asl
+++ b/src/mainboard/compulab/intense_pc/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl
index 387fd32958..8b81ebff61 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl
@@ -21,7 +21,7 @@ DefinitionBlock(
 	0x20141018	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/mainboard.asl"
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
index 7ee12a08ee..b1ecdfd076 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	#include "acpi/superio.asl"
 	#include "acpi/thermal.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	/* global NVS and variables. */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl
index c71535c9a1..8a9d71b560 100644
--- a/src/mainboard/google/butterfly/dsdt.asl
+++ b/src/mainboard/google/butterfly/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/google/link/dsdt.asl b/src/mainboard/google/link/dsdt.asl
index e380f3e1e7..4c23e7dd0c 100644
--- a/src/mainboard/google/link/dsdt.asl
+++ b/src/mainboard/google/link/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl
index 1f72a6d5d0..0465ceda26 100644
--- a/src/mainboard/google/parrot/dsdt.asl
+++ b/src/mainboard/google/parrot/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl
index 43d0fff948..580ca1606d 100644
--- a/src/mainboard/google/stout/dsdt.asl
+++ b/src/mainboard/google/stout/dsdt.asl
@@ -25,7 +25,7 @@ DefinitionBlock(
 	0x20110725  // OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/hp/2570p/dsdt.asl b/src/mainboard/hp/2570p/dsdt.asl
index 7a171aea58..5730ea083e 100644
--- a/src/mainboard/hp/2570p/dsdt.asl
+++ b/src/mainboard/hp/2570p/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/2760p/dsdt.asl b/src/mainboard/hp/2760p/dsdt.asl
index 7a171aea58..5730ea083e 100644
--- a/src/mainboard/hp/2760p/dsdt.asl
+++ b/src/mainboard/hp/2760p/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/8460p/dsdt.asl b/src/mainboard/hp/8460p/dsdt.asl
index 7a171aea58..5730ea083e 100644
--- a/src/mainboard/hp/8460p/dsdt.asl
+++ b/src/mainboard/hp/8460p/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/8470p/dsdt.asl b/src/mainboard/hp/8470p/dsdt.asl
index 7a171aea58..5730ea083e 100644
--- a/src/mainboard/hp/8470p/dsdt.asl
+++ b/src/mainboard/hp/8470p/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/8770w/dsdt.asl b/src/mainboard/hp/8770w/dsdt.asl
index 7a171aea58..5730ea083e 100644
--- a/src/mainboard/hp/8770w/dsdt.asl
+++ b/src/mainboard/hp/8770w/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl
index c3453b0d40..3f249e35a5 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl
+++ b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/folio_9470m/dsdt.asl b/src/mainboard/hp/folio_9470m/dsdt.asl
index 7a171aea58..5730ea083e 100644
--- a/src/mainboard/hp/folio_9470m/dsdt.asl
+++ b/src/mainboard/hp/folio_9470m/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/revolve_810_g1/dsdt.asl b/src/mainboard/hp/revolve_810_g1/dsdt.asl
index 7a171aea58..5730ea083e 100644
--- a/src/mainboard/hp/revolve_810_g1/dsdt.asl
+++ b/src/mainboard/hp/revolve_810_g1/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/hp/z220_sff_workstation/dsdt.asl b/src/mainboard/hp/z220_sff_workstation/dsdt.asl
index c3453b0d40..3f249e35a5 100644
--- a/src/mainboard/hp/z220_sff_workstation/dsdt.asl
+++ b/src/mainboard/hp/z220_sff_workstation/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/intel/dcp847ske/dsdt.asl b/src/mainboard/intel/dcp847ske/dsdt.asl
index 9d1d26198f..39e7008759 100644
--- a/src/mainboard/intel/dcp847ske/dsdt.asl
+++ b/src/mainboard/intel/dcp847ske/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl
index d9792ff9d5..74268ef60a 100644
--- a/src/mainboard/intel/emeraldlake2/dsdt.asl
+++ b/src/mainboard/intel/emeraldlake2/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/kontron/ktqm77/dsdt.asl b/src/mainboard/kontron/ktqm77/dsdt.asl
index 33ef834c47..2d6ce7953b 100644
--- a/src/mainboard/kontron/ktqm77/dsdt.asl
+++ b/src/mainboard/kontron/ktqm77/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/l520/dsdt.asl b/src/mainboard/lenovo/l520/dsdt.asl
index 815600d48c..8b2c3e6005 100644
--- a/src/mainboard/lenovo/l520/dsdt.asl
+++ b/src/mainboard/lenovo/l520/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/lenovo/s230u/dsdt.asl b/src/mainboard/lenovo/s230u/dsdt.asl
index 4e5737b109..01bb91f376 100644
--- a/src/mainboard/lenovo/s230u/dsdt.asl
+++ b/src/mainboard/lenovo/s230u/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	#include "acpi/platform.asl"
 	#include "acpi/gpe.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
diff --git a/src/mainboard/lenovo/t410/dsdt.asl b/src/mainboard/lenovo/t410/dsdt.asl
index 5c99f1bbf6..9d0204e5cc 100644
--- a/src/mainboard/lenovo/t410/dsdt.asl
+++ b/src/mainboard/lenovo/t410/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	0x20130325	/* OEM revision */
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	/* Some generic macros */
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/t420/dsdt.asl b/src/mainboard/lenovo/t420/dsdt.asl
index 83bf8c43cd..a6a57e256e 100644
--- a/src/mainboard/lenovo/t420/dsdt.asl
+++ b/src/mainboard/lenovo/t420/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/t420s/dsdt.asl b/src/mainboard/lenovo/t420s/dsdt.asl
index 83bf8c43cd..a6a57e256e 100644
--- a/src/mainboard/lenovo/t420s/dsdt.asl
+++ b/src/mainboard/lenovo/t420s/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/t430/dsdt.asl b/src/mainboard/lenovo/t430/dsdt.asl
index 7e80a6f0bd..55781d6b5f 100644
--- a/src/mainboard/lenovo/t430/dsdt.asl
+++ b/src/mainboard/lenovo/t430/dsdt.asl
@@ -34,7 +34,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/lenovo/t430s/dsdt.asl b/src/mainboard/lenovo/t430s/dsdt.asl
index 83bf8c43cd..a6a57e256e 100644
--- a/src/mainboard/lenovo/t430s/dsdt.asl
+++ b/src/mainboard/lenovo/t430s/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl
index 83bf8c43cd..a6a57e256e 100644
--- a/src/mainboard/lenovo/t520/dsdt.asl
+++ b/src/mainboard/lenovo/t520/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl
index 83bf8c43cd..a6a57e256e 100644
--- a/src/mainboard/lenovo/t530/dsdt.asl
+++ b/src/mainboard/lenovo/t530/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/x131e/dsdt.asl b/src/mainboard/lenovo/x131e/dsdt.asl
index 5fd1c9d653..95eb2db254 100644
--- a/src/mainboard/lenovo/x131e/dsdt.asl
+++ b/src/mainboard/lenovo/x131e/dsdt.asl
@@ -35,7 +35,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// global NVS and variables
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
index 4d1281e9e0..3acc87d33c 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
+++ b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20141018	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl
index 5c99f1bbf6..9d0204e5cc 100644
--- a/src/mainboard/lenovo/x201/dsdt.asl
+++ b/src/mainboard/lenovo/x201/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	0x20130325	/* OEM revision */
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	/* Some generic macros */
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/x220/dsdt.asl b/src/mainboard/lenovo/x220/dsdt.asl
index 83bf8c43cd..a6a57e256e 100644
--- a/src/mainboard/lenovo/x220/dsdt.asl
+++ b/src/mainboard/lenovo/x220/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/lenovo/x230/dsdt.asl b/src/mainboard/lenovo/x230/dsdt.asl
index 83bf8c43cd..a6a57e256e 100644
--- a/src/mainboard/lenovo/x230/dsdt.asl
+++ b/src/mainboard/lenovo/x230/dsdt.asl
@@ -31,7 +31,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/msi/ms7707/dsdt.asl b/src/mainboard/msi/ms7707/dsdt.asl
index d3e3602c16..1aa87fe332 100644
--- a/src/mainboard/msi/ms7707/dsdt.asl
+++ b/src/mainboard/msi/ms7707/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock(
 	/* Some generic macros */
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables. */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/packardbell/ms2290/dsdt.asl b/src/mainboard/packardbell/ms2290/dsdt.asl
index e84f52563c..72b7d4c78a 100644
--- a/src/mainboard/packardbell/ms2290/dsdt.asl
+++ b/src/mainboard/packardbell/ms2290/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20140108	/* OEM revision */
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	/* Some generic macros */
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/roda/rv11/dsdt.asl b/src/mainboard/roda/rv11/dsdt.asl
index 21ab36926f..67f88d0803 100644
--- a/src/mainboard/roda/rv11/dsdt.asl
+++ b/src/mainboard/roda/rv11/dsdt.asl
@@ -23,7 +23,7 @@ DefinitionBlock(
 	0x20141018	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl
index e6bbed7ca5..7dd85b5cd6 100644
--- a/src/mainboard/samsung/lumpy/dsdt.asl
+++ b/src/mainboard/samsung/lumpy/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl
index 7029106020..db8bfd45d2 100644
--- a/src/mainboard/samsung/stumpy/dsdt.asl
+++ b/src/mainboard/samsung/stumpy/dsdt.asl
@@ -24,7 +24,7 @@ DefinitionBlock(
 	0x20110725	// OEM revision
 )
 {
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 
 	// Some generic macros
 	#include "acpi/platform.asl"
diff --git a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl
index 67eca4ac5f..fee7e9356f 100644
--- a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl
+++ b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	// Some generic macros
 	#include "acpi/platform.asl"
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <southbridge/intel/bd82x6x/acpi/platform.asl>
+	#include <southbridge/intel/common/acpi/platform.asl>
 	/* global NVS and variables.  */
 	#include <southbridge/intel/bd82x6x/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/southbridge/intel/bd82x6x/acpi/platform.asl b/src/southbridge/intel/bd82x6x/acpi/platform.asl
deleted file mode 100644
index e37066887b..0000000000
--- a/src/southbridge/intel/bd82x6x/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)
-}