From e5bcc72049aa59a41cbf3ec8aaaa8994c62a227b Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 30 Apr 2020 23:05:11 -0700 Subject: acpi: Move ACPI table support out of arch/x86 (5/5) This change moves all ACPI table support in coreboot currently living under arch/x86 into common code to make it architecture independent. ACPI table generation is not really tied to any architecture and hence it makes sense to move this to its own directory. In order to make it easier to review, this change is being split into multiple CLs. This is change 5/5 which moves the addition of ACPI table related files from arch/x86/Makefile.inc to acpi/Makefile.inc. BUG=b:155428745 Change-Id: I8143fd37357aeb0561516450adddc6714d539ada Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/40940 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes Reviewed-by: Frans Hendriks Reviewed-by: Aaron Durbin Reviewed-by: Raul Rangel Reviewed-by: Duncan Laurie --- src/acpi/Makefile.inc | 8 ++++++++ src/arch/x86/Makefile.inc | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/acpi/Makefile.inc b/src/acpi/Makefile.inc index 068c592db7..09ff9f1e58 100644 --- a/src/acpi/Makefile.inc +++ b/src/acpi/Makefile.inc @@ -12,4 +12,12 @@ ramstage-y += acpigen_ps2_keybd.c ramstage-y += sata.c +ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/acpi_tables.c),) +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c +endif +$(eval $(call asl_template,dsdt)) +ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),) +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c +endif + endif # CONFIG_GENERATE_ACPI_TABLES diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index aa1f5fef5f..c29d5edf23 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -281,15 +281,6 @@ endif ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/reset.c),) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c endif -ifeq ($(CONFIG_HAVE_ACPI_TABLES),y) -ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/acpi_tables.c),) -ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c -endif -$(eval $(call asl_template,dsdt)) -ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),) -ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c -endif -endif # CONFIG_GENERATE_ACPI_TABLES ramstage-libs ?= -- cgit v1.2.3