summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2023-12-19 22:33:46 +0100
committerFelix Held <felix-coreboot@felixheld.de>2024-01-04 14:16:48 +0000
commit41a5954a6785bfad95dce36611b92f1123e350e2 (patch)
tree8e03f48ee188cb31d0ca07830ef5f3b383554fd0 /src/mainboard
parent3329e8893eaef8637b3ebdcf3b46e8adcdb5539a (diff)
soc/amd/picasso/acpi: move SoC-common code from dsdt.asl to soc.asl
To avoid code duplication and to also bring the mainboards using the Picasso SoC more in line with Cezanne and newer, factor out the SoC- specific code from the mainboard's dsdt.asl files to the SoC's soc.asl. TEST=Timeless builds result in identical images for Bilby, Mandolin, and Zork/Morphius Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Id4ed3a3d3cb55c8b3b474c66a7c1700e24fe908e Reviewed-on: https://review.coreboot.org/c/coreboot/+/79653 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Eric Lai <ericllai@google.com> Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/amd/bilby/dsdt.asl20
-rw-r--r--src/mainboard/amd/mandolin/dsdt.asl20
-rw-r--r--src/mainboard/google/zork/dsdt.asl21
3 files changed, 3 insertions, 58 deletions
diff --git a/src/mainboard/amd/bilby/dsdt.asl b/src/mainboard/amd/bilby/dsdt.asl
index dd42608162..57ee5d63a9 100644
--- a/src/mainboard/amd/bilby/dsdt.asl
+++ b/src/mainboard/amd/bilby/dsdt.asl
@@ -14,25 +14,7 @@ DefinitionBlock (
)
{ /* Start of ASL file */
#include <acpi/dsdt_top.asl>
- #include <globalnvs.asl>
- /* Power state notification to ALIB */
- #include <pnot.asl>
-
- /* Contains the supported sleep states for this chipset */
- #include <soc/amd/common/acpi/sleepstates.asl>
-
- /* Contains _SWS methods */
- #include <soc/amd/common/acpi/acpi_wake_source.asl>
-
- /* System Bus */
- Scope(\_SB) { /* Start \_SB scope */
- /* global utility methods expected within the \_SB scope */
- #include <arch/x86/acpi/globutil.asl>
-
- /* Describe the SOC */
- #include <soc.asl>
-
- } /* End \_SB scope */
+ #include <soc.asl>
}
/* End of ASL file */
diff --git a/src/mainboard/amd/mandolin/dsdt.asl b/src/mainboard/amd/mandolin/dsdt.asl
index dd42608162..57ee5d63a9 100644
--- a/src/mainboard/amd/mandolin/dsdt.asl
+++ b/src/mainboard/amd/mandolin/dsdt.asl
@@ -14,25 +14,7 @@ DefinitionBlock (
)
{ /* Start of ASL file */
#include <acpi/dsdt_top.asl>
- #include <globalnvs.asl>
- /* Power state notification to ALIB */
- #include <pnot.asl>
-
- /* Contains the supported sleep states for this chipset */
- #include <soc/amd/common/acpi/sleepstates.asl>
-
- /* Contains _SWS methods */
- #include <soc/amd/common/acpi/acpi_wake_source.asl>
-
- /* System Bus */
- Scope(\_SB) { /* Start \_SB scope */
- /* global utility methods expected within the \_SB scope */
- #include <arch/x86/acpi/globutil.asl>
-
- /* Describe the SOC */
- #include <soc.asl>
-
- } /* End \_SB scope */
+ #include <soc.asl>
}
/* End of ASL file */
diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl
index dc4322daee..4cb85069b7 100644
--- a/src/mainboard/google/zork/dsdt.asl
+++ b/src/mainboard/google/zork/dsdt.asl
@@ -18,26 +18,7 @@ DefinitionBlock (
Name(LIDS, 0)
- #include <globalnvs.asl>
-
- /* Power state notification to ALIB */
- #include <pnot.asl>
-
- /* Contains the supported sleep states for this chipset */
- #include <soc/amd/common/acpi/sleepstates.asl>
-
- /* Contains _SWS methods */
- #include <soc/amd/common/acpi/acpi_wake_source.asl>
-
- /* System Bus */
- Scope(\_SB) { /* Start \_SB scope */
- /* global utility methods expected within the \_SB scope */
- #include <arch/x86/acpi/globutil.asl>
-
- /* Describe the SOC */
- #include <soc.asl>
-
- } /* End \_SB scope */
+ #include <soc.asl>
/* Thermal handler */
#include <variant/acpi/thermal.asl>