diff options
| author | Simon Glass <sjg@chromium.org> | 2021-12-01 19:02:43 +0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2022-01-25 21:44:36 +0300 |
| commit | 437992d3a936299226b7f0b27d38319b45d4a9e5 (patch) | |
| tree | 41178d9168de21022b66fbce6e97026a30820f0b | |
| parent | a9e414dd50c57113f810812af1fd1d1f502b3f57 (diff) | |
| download | u-boot-437992d3a936299226b7f0b27d38319b45d4a9e5.tar.xz | |
acpi: Use finer-grained control of ACPI-table generation
Rather than keying everything off ACPIGEN, use the main
GENERATE_ACPI_TABLE option to determine whether the core ACPI code
is included. Make sure these option are not enabled in SPL/TPL since we
never generate tables there.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/acpi/Makefile | 8 |
4 files changed, 7 insertions, 6 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index c5dd7fcaf7..bea8ead561 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -203,6 +203,7 @@ config SANDBOX imply CMD_EXTENSION imply KEYBOARD imply PHYSMEM + imply GENERATE_ACPI_TABLE config SH bool "SuperH architecture" diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index e5235b7c4f..a6f2244147 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -41,7 +41,7 @@ obj-y += acpi.o obj-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.o ifndef CONFIG_QEMU obj-y += acpigen.o -obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o +obj-$(CONFIG_$(SPL_TPL_)GENERATE_ACPI_TABLE) += acpi_table.o endif obj-y += tables.o ifndef CONFIG_SPL_BUILD diff --git a/lib/Makefile b/lib/Makefile index 7950e847a9..bde046c72d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -58,7 +58,7 @@ obj-$(CONFIG_TPM_V1) += tpm-v1.o obj-$(CONFIG_TPM_V2) += tpm-v2.o endif -obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi/ +obj-$(CONFIG_$(SPL_TPL_)GENERATE_ACPI_TABLE) += acpi/ obj-$(CONFIG_$(SPL_)MD5) += md5.o obj-$(CONFIG_ECDSA) += ecdsa/ obj-$(CONFIG_$(SPL_)RSA) += rsa/ diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile index 5c2f793701..f5d58aba90 100644 --- a/lib/acpi/Makefile +++ b/lib/acpi/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += acpigen.o -obj-y += acpi_device.o -obj-y += acpi_dp.o -obj-y += acpi_table.o +obj-$(CONFIG_$(SPL_)ACPIGEN) += acpigen.o +obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi_device.o +obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi_dp.o +obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi_table.o |