AGESA,binaryPI boards: Move common PCBA in ASL

Change-Id: I9d502882c4ddb54af1da42a41591804da2cee0ac
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50647
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

41 files changed, 8 insertions, 89 deletions

diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl
index 3e6bb1c530..160a53fc7b 100644
--- a/src/acpi/dsdt_top.asl
+++ b/src/acpi/dsdt_top.asl
@@ -30,3 +30,11 @@ Method (_PIC, 1)
 	/* Remember the OS' IRQ routing choice. */
 	PICM = Arg0
 }
+
+#if CONFIG(MMCONF_SUPPORT)
+/* Base address of PCIe config space */
+Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)
+
+/* Length of PCIe config space, 1MB each bus */
+Name(PCLN, CONFIG_MMCONF_LENGTH)
+#endif
diff --git a/src/mainboard/amd/gardenia/acpi/mainboard.asl b/src/mainboard/amd/gardenia/acpi/mainboard.asl
deleted file mode 100644
index 3a9eafb041..0000000000
--- a/src/mainboard/amd/gardenia/acpi/mainboard.asl
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
diff --git a/src/mainboard/amd/gardenia/dsdt.asl b/src/mainboard/amd/gardenia/dsdt.asl
index e21934f7fc..a22e090089 100644
--- a/src/mainboard/amd/gardenia/dsdt.asl
+++ b/src/mainboard/amd/gardenia/dsdt.asl
@@ -18,9 +18,6 @@ DefinitionBlock (
 	/* global NVS and variables */
 	#include <globalnvs.asl>
 
-	/* Globals for the platform */
-	#include "acpi/mainboard.asl"
-
 	/* Describe the USB Overcurrent pins */
 	#include "acpi/usb_oc.asl"
 
diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/amd/inagua/acpi/mainboard.asl
+++ b/src/mainboard/amd/inagua/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/amd/olivehill/acpi/mainboard.asl b/src/mainboard/amd/olivehill/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/amd/olivehill/acpi/mainboard.asl
+++ b/src/mainboard/amd/olivehill/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/amd/padmelon/acpi/mainboard.asl b/src/mainboard/amd/padmelon/acpi/mainboard.asl
deleted file mode 100644
index 3a9eafb041..0000000000
--- a/src/mainboard/amd/padmelon/acpi/mainboard.asl
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
diff --git a/src/mainboard/amd/padmelon/dsdt.asl b/src/mainboard/amd/padmelon/dsdt.asl
index ca4740eb58..7b7f239e5a 100644
--- a/src/mainboard/amd/padmelon/dsdt.asl
+++ b/src/mainboard/amd/padmelon/dsdt.asl
@@ -16,9 +16,6 @@ DefinitionBlock (
 	/* global NVS and variables */
 	#include <globalnvs.asl>
 
-	/* Globals for the platform */
-	#include "acpi/mainboard.asl"
-
 	/* Describe the USB Overcurrent pins */
 	#include "acpi/usb_oc.asl"
 
diff --git a/src/mainboard/amd/parmer/acpi/mainboard.asl b/src/mainboard/amd/parmer/acpi/mainboard.asl
index ae2823e7d7..f7fc551df9 100644
--- a/src/mainboard/amd/parmer/acpi/mainboard.asl
+++ b/src/mainboard/amd/parmer/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-	Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/amd/persimmon/acpi/mainboard.asl
+++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/amd/south_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/south_station/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/amd/thatcher/acpi/mainboard.asl b/src/mainboard/amd/thatcher/acpi/mainboard.asl
index ae2823e7d7..f7fc551df9 100644
--- a/src/mainboard/amd/thatcher/acpi/mainboard.asl
+++ b/src/mainboard/amd/thatcher/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-	Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/amd/union_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/union_station/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl
+++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/asus/a88xm-e/acpi/mainboard.asl b/src/mainboard/asus/a88xm-e/acpi/mainboard.asl
deleted file mode 100644
index 49d98d2c94..0000000000
--- a/src/mainboard/asus/a88xm-e/acpi/mainboard.asl
+++ /dev/null
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-	/* Base address of PCIe config space */
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)
-	/* Length of PCIe config space, 1MB each bus */
-	Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER))
-	/* Base address of HPET table */
diff --git a/src/mainboard/asus/a88xm-e/dsdt.asl b/src/mainboard/asus/a88xm-e/dsdt.asl
index 5b057a1cb2..97e2d754e7 100644
--- a/src/mainboard/asus/a88xm-e/dsdt.asl
+++ b/src/mainboard/asus/a88xm-e/dsdt.asl
@@ -13,9 +13,6 @@ DefinitionBlock (
 {	/* Start of ASL file */
 	#include <acpi/dsdt_top.asl>
 
-	/* Globals for the platform */
-	#include "acpi/mainboard.asl"
-
 	/* Describe the USB Overcurrent pins */
 	#include "acpi/usb_oc.asl"
 
diff --git a/src/mainboard/asus/am1i-a/acpi/mainboard.asl b/src/mainboard/asus/am1i-a/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/asus/am1i-a/acpi/mainboard.asl
+++ b/src/mainboard/asus/am1i-a/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
deleted file mode 100644
index 0f90393d21..0000000000
--- a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-	Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
diff --git a/src/mainboard/asus/f2a85-m/dsdt.asl b/src/mainboard/asus/f2a85-m/dsdt.asl
index 7ab5f694a6..6682e7b6b6 100644
--- a/src/mainboard/asus/f2a85-m/dsdt.asl
+++ b/src/mainboard/asus/f2a85-m/dsdt.asl
@@ -13,9 +13,6 @@ DefinitionBlock (
 {	/* Start of ASL file */
 	#include <acpi/dsdt_top.asl>
 
-	/* Globals for the platform */
-	#include "acpi/mainboard.asl"
-
 	/* Describe the USB Overcurrent pins */
 	#include "acpi/usb_oc.asl"
 
diff --git a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl b/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl
+++ b/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/biostar/am1ml/acpi/mainboard.asl b/src/mainboard/biostar/am1ml/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/biostar/am1ml/acpi/mainboard.asl
+++ b/src/mainboard/biostar/am1ml/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl
+++ b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl
index 3882bdfd6d..7aefe2cae6 100644
--- a/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/aleena/include/variant/acpi/mainboard.asl
@@ -1,4 +1,3 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <baseboard/acpi/mainboard.asl>
 #include <baseboard/acpi/audio.asl>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
deleted file mode 100644
index 9ba02606fd..0000000000
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Base address of PCIe config space */
-Name (PCBA, CONFIG_MMCONF_BASE_ADDRESS)
-
-/* Length of PCIe config space, 1MB each bus */
-Name (PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER))
-
-/* Base address of HPET table */
diff --git a/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl
index 3882bdfd6d..7aefe2cae6 100644
--- a/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/careena/include/variant/acpi/mainboard.asl
@@ -1,4 +1,3 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <baseboard/acpi/mainboard.asl>
 #include <baseboard/acpi/audio.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
index 3882bdfd6d..7aefe2cae6 100644
--- a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
@@ -1,4 +1,3 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <baseboard/acpi/mainboard.asl>
 #include <baseboard/acpi/audio.asl>
diff --git a/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl
index 3882bdfd6d..7aefe2cae6 100644
--- a/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/liara/include/variant/acpi/mainboard.asl
@@ -1,4 +1,3 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <baseboard/acpi/mainboard.asl>
 #include <baseboard/acpi/audio.asl>
diff --git a/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl
index 3882bdfd6d..7aefe2cae6 100644
--- a/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/nuwani/include/variant/acpi/mainboard.asl
@@ -1,4 +1,3 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <baseboard/acpi/mainboard.asl>
 #include <baseboard/acpi/audio.asl>
diff --git a/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl
index 3882bdfd6d..7aefe2cae6 100644
--- a/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/kahlee/variants/treeya/include/variant/acpi/mainboard.asl
@@ -1,4 +1,3 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <baseboard/acpi/mainboard.asl>
 #include <baseboard/acpi/audio.asl>
diff --git a/src/mainboard/hp/abm/acpi/mainboard.asl b/src/mainboard/hp/abm/acpi/mainboard.asl
index 02e71927a6..cfa48e9c35 100644
--- a/src/mainboard/hp/abm/acpi/mainboard.asl
+++ b/src/mainboard/hp/abm/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index 27c48b5d31..b11ad68e10 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-	Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/lenovo/g505s/acpi/mainboard.asl b/src/mainboard/lenovo/g505s/acpi/mainboard.asl
index 27c48b5d31..b11ad68e10 100644
--- a/src/mainboard/lenovo/g505s/acpi/mainboard.asl
+++ b/src/mainboard/lenovo/g505s/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-	Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 	/* AcpiGpe0Blk */
 	OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index 826f8bd7bf..cbb8ced2a0 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -13,7 +13,6 @@ DefinitionBlock (
 {	/* Start of ASL file */
 	#include <acpi/dsdt_top.asl>
 
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 	/* USB overcurrent mapping pins.   */
 	Name(UOM0, 0)
diff --git a/src/mainboard/msi/ms7721/acpi/mainboard.asl b/src/mainboard/msi/ms7721/acpi/mainboard.asl
deleted file mode 100644
index 0f90393d21..0000000000
--- a/src/mainboard/msi/ms7721/acpi/mainboard.asl
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-	Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-	Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
diff --git a/src/mainboard/msi/ms7721/dsdt.asl b/src/mainboard/msi/ms7721/dsdt.asl
index b0caa43db7..3dbcf46ef3 100644
--- a/src/mainboard/msi/ms7721/dsdt.asl
+++ b/src/mainboard/msi/ms7721/dsdt.asl
@@ -14,9 +14,6 @@ DefinitionBlock (
 	#include <acpi/dsdt_top.asl>
 	#include <arch/x86/acpi/debug.asl>	/* Include global debug methods if needed */
 
-	/* Globals for the platform */
-	#include "acpi/mainboard.asl"
-
 	/* PCI IRQ mapping for the Southbridge */
 	#include <southbridge/amd/agesa/hudson/acpi/pcie.asl>
 
diff --git a/src/mainboard/pcengines/apu1/acpi/mainboard.asl b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
index 32ab6112e3..b7b630afb6 100644
--- a/src/mainboard/pcengines/apu1/acpi/mainboard.asl
+++ b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
 
 Scope(\_SI) {
 	Method(_SST, 1) {
diff --git a/src/mainboard/pcengines/apu2/acpi/mainboard.asl b/src/mainboard/pcengines/apu2/acpi/mainboard.asl
index 406f18880c..9b18e722c7 100644
--- a/src/mainboard/pcengines/apu2/acpi/mainboard.asl
+++ b/src/mainboard/pcengines/apu2/acpi/mainboard.asl
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)	/* Base address of PCIe config space */
-Name(PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER)) /* Length of PCIe config space, 1MB each bus */
 
 /* AcpiGpe0Blk */
 OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)