summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2019-05-03 10:20:44 -0600
committerMartin Roth <martinroth@google.com>2019-06-06 18:50:44 +0000
commit3ce0360592f036ce586a49db84146d435a23e662 (patch)
tree20377cf7cd209a20354fa21f9d0c8655fabacb45
parent6ab5ed3b66fc215d0d03b19ab02fdcf8613c7d09 (diff)
downloadcoreboot-3ce0360592f036ce586a49db84146d435a23e662.tar.xz
soc/amd/common: Rework block/acpi
The halt.c file relies on the ACPI register block in the AcpiMmio range. This register block is consistent across AMD device generations, so to prepare for moving additional stoneyridge support to this directory by changing the file name and add a Kconfig symbol to control the build. BUG=b:131682806 Change-Id: I2f7442dd78bced7f69b0416a8cd751291f82151f Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32654 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/common/block/acpi/Kconfig6
-rw-r--r--src/soc/amd/common/block/acpi/Makefile.inc4
-rw-r--r--src/soc/amd/common/block/acpi/acpi.c (renamed from src/soc/amd/common/block/acpi/halt.c)0
-rw-r--r--src/soc/amd/stoneyridge/Kconfig1
4 files changed, 9 insertions, 2 deletions
diff --git a/src/soc/amd/common/block/acpi/Kconfig b/src/soc/amd/common/block/acpi/Kconfig
new file mode 100644
index 0000000000..2b87f186fb
--- /dev/null
+++ b/src/soc/amd/common/block/acpi/Kconfig
@@ -0,0 +1,6 @@
+config SOC_AMD_COMMON_BLOCK_ACPI
+ bool
+ depends on SOC_AMD_COMMON_BLOCK_ACPIMMIO
+ default n
+ help
+ Select this option to use the AcpiMmio ACPI registers.
diff --git a/src/soc/amd/common/block/acpi/Makefile.inc b/src/soc/amd/common/block/acpi/Makefile.inc
index b67eadab8f..1320849fc3 100644
--- a/src/soc/amd/common/block/acpi/Makefile.inc
+++ b/src/soc/amd/common/block/acpi/Makefile.inc
@@ -1,2 +1,2 @@
-ramstage-y += halt.c
-smm-y += halt.c
+ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
+smm-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
diff --git a/src/soc/amd/common/block/acpi/halt.c b/src/soc/amd/common/block/acpi/acpi.c
index 200b3c12f5..200b3c12f5 100644
--- a/src/soc/amd/common/block/acpi/halt.c
+++ b/src/soc/amd/common/block/acpi/acpi.c
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index ef7a7ae33f..ed9aaf05ba 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -48,6 +48,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_AMD_COMMON_BLOCK
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
+ select SOC_AMD_COMMON_BLOCK_ACPI
select SOC_AMD_COMMON_BLOCK_LPC
select SOC_AMD_COMMON_BLOCK_PCI
select SOC_AMD_COMMON_BLOCK_PI