summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-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