From fca612497db15caebdf97d741c85193ee2f0044b Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 22 Jun 2023 21:51:28 +0200 Subject: [PATCH] acpi/Makefile.inc: Move code inclusion Signed-off-by: Arthur Heymans Change-Id: I63bbac225662377693ad5f29cc8911494c49b422 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76009 Tested-by: build bot (Jenkins) Reviewed-by: Elyes Haouas Reviewed-by: Lean Sheng Tan --- src/acpi/Makefile.inc | 5 +++++ src/arch/x86/Makefile.inc | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/acpi/Makefile.inc b/src/acpi/Makefile.inc index 0c49e682ea..e4a832f314 100644 --- a/src/acpi/Makefile.inc +++ b/src/acpi/Makefile.inc @@ -3,6 +3,11 @@ ifeq ($(CONFIG_HAVE_ACPI_TABLES),y) ramstage-y += acpi.c +ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y) +ramstage-y += acpi_apic.c +ramstage-y += acpi_dmar.c +ramstage-y += acpi_hpet.c +endif ramstage-y += acpigen.c ramstage-y += acpigen_dptf.c ramstage-y += acpigen_dsm.c diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index accb022a81..384eacd00d 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -248,7 +248,6 @@ $(CONFIG_CBFS_PREFIX)/postcar-compression := none ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y) ramstage-y += acpi.c -ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ../../acpi/acpi_apic.c ../../acpi/acpi_hpet.c ../../acpi/acpi_dmar.c ramstage-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c ramstage-$(CONFIG_ACPI_BERT) += acpi_bert_storage.c ramstage-y += boot.c