summaryrefslogtreecommitdiff
path: root/src/soc/intel/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel/common')
-rw-r--r--src/soc/intel/common/block/acpi/acpi.c2
-rw-r--r--src/soc/intel/common/block/pmc/Kconfig11
2 files changed, 1 insertions, 12 deletions
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index af7212e70e..16017779d9 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -142,7 +142,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
ACPI_FADT_SLEEP_BUTTON |
ACPI_FADT_SEALED_CASE | ACPI_FADT_S4_RTC_WAKE;
- if (CONFIG(USE_PM_ACPI_TIMER) || !CONFIG(PM_ACPI_TIMER_OPTIONAL))
+ if (CONFIG(USE_PM_ACPI_TIMER))
fadt->flags |= ACPI_FADT_PLATFORM_CLOCK;
fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
diff --git a/src/soc/intel/common/block/pmc/Kconfig b/src/soc/intel/common/block/pmc/Kconfig
index 6ec9339806..fa1a99076b 100644
--- a/src/soc/intel/common/block/pmc/Kconfig
+++ b/src/soc/intel/common/block/pmc/Kconfig
@@ -55,15 +55,6 @@ config NO_PM_ACPI_TIMER
help
Selected by SoCs that do not have a PM ACPI timer.
-config PM_ACPI_TIMER_OPTIONAL
- bool
- default n
- help
- This needs to be selected by SoCs, where the hardware PM Timer
- can be disabled, to show the ACPI PM Timer Kconfig in menuconfig.
-
-if PM_ACPI_TIMER_OPTIONAL
-
config USE_PM_ACPI_TIMER
bool "Enable ACPI PM timer"
default y
@@ -82,5 +73,3 @@ config USE_PM_ACPI_TIMER
(Legacy) software requiring `TMR_STS` (for timer overflow
interrupts) will not work with this option disabled.
-
-endif # PM_ACPI_TIMER_OPTIONAL