diff options
| author | Furquan Shaikh <furquan@google.com> | 2020-04-30 18:08:16 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2020-05-02 20:41:21 +0000 |
| commit | bf4b7b057737884fe4ac3a92e8ccbee370165e80 (patch) | |
| tree | 139011c597c69c3d0339f9d6f5f067223e8fcc02 | |
| parent | 56eafbbc3ac6ea01a03daf4b54a989d3d44260ae (diff) | |
acpi: Reorganize ACPI configs
In order to the Kconfigs in the same directory where the corresponding
code lives, this change moves ACPI_BERT to arch/x86/Kconfig and
following configs to acpi/Kconfig:
ACPI_CPU_STRING
ACPI_HAVE_PCAT_8259
ACPI_NO_PCAT_8259
HAVE_ACPI_TABLES
BUG=b:155428745
Change-Id: I289565f38e46bd106ff89685aaf8f57e53d9827a
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40932
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/Kconfig | 12 | ||||
| -rw-r--r-- | src/acpi/Kconfig | 31 | ||||
| -rw-r--r-- | src/arch/x86/Kconfig | 15 |
3 files changed, 29 insertions, 29 deletions
diff --git a/src/Kconfig b/src/Kconfig index cf4df18247..65404995c9 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -624,12 +624,6 @@ config GFXUMA help Enable Unified Memory Architecture for graphics. -config HAVE_ACPI_TABLES - bool - help - This variable specifies whether a given board has ACPI table support. - It is usually set in mainboard/*/Kconfig. - config HAVE_MP_TABLE bool help @@ -656,12 +650,6 @@ config ACPI_NHLT help Build support for NHLT (non HD Audio) ACPI table generation. -config ACPI_BERT - bool - depends on HAVE_ACPI_TABLES - help - Build an ACPI Boot Error Record Table. - #These Options are here to avoid "undefined" warnings. #The actual selection and help texts are in the following menu. diff --git a/src/acpi/Kconfig b/src/acpi/Kconfig index 8c8bb87884..22e0323c52 100644 --- a/src/acpi/Kconfig +++ b/src/acpi/Kconfig @@ -1,14 +1,37 @@ # SPDX-License-Identifier: GPL-2.0-only # This file is part of the coreboot project. -config ACPI_INTEL_HARDWARE_SLEEP_VALUES +config ACPI_AMD_HARDWARE_SLEEP_VALUES def_bool n help - Provide common definitions for Intel hardware PM1_CNT register sleep + Provide common definitions for AMD hardware PM1_CNT register sleep values. -config ACPI_AMD_HARDWARE_SLEEP_VALUES +config ACPI_CPU_STRING + string + default "\\_SB.CP%02d" + depends on HAVE_ACPI_TABLES + help + Sets the ACPI name string in the processor scope as written by + the acpigen function. Default is \_SB.CPxx. Note that you need + the \ escape character in the string. + +config ACPI_HAVE_PCAT_8259 + def_bool y if !ACPI_NO_PCAT_8259 + +config ACPI_INTEL_HARDWARE_SLEEP_VALUES def_bool n help - Provide common definitions for AMD hardware PM1_CNT register sleep + Provide common definitions for Intel hardware PM1_CNT register sleep values. + +config ACPI_NO_PCAT_8259 + bool + help + Selected by platforms that don't expose a PC/AT 8259 PIC pair. + +config HAVE_ACPI_TABLES + bool + help + This variable specifies whether a given board has ACPI table support. + It is usually set in mainboard/*/Kconfig. diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 11733bd05e..7e10f60c0e 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -246,22 +246,11 @@ config SKIP_MAX_REBOOT_CNT_CLEAR Note that it is the responsibility of the payload to reset the normal boot bit to 1 after each successful boot. -config ACPI_NO_PCAT_8259 +config ACPI_BERT bool - help - Selected by platforms that don't expose a PC/AT 8259 PIC pair. - -config ACPI_HAVE_PCAT_8259 - def_bool y if !ACPI_NO_PCAT_8259 - -config ACPI_CPU_STRING - string - default "\\_SB.CP%02d" depends on HAVE_ACPI_TABLES help - Sets the ACPI name string in the processor scope as written by - the acpigen function. Default is \_SB.CPxx. Note that you need - the \ escape character in the string. + Build an ACPI Boot Error Record Table. config COLLECT_TIMESTAMPS_NO_TSC bool |