summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2020-04-30 23:05:11 -0700
committerFurquan Shaikh <furquan@google.com>2020-05-02 20:41:04 +0000
commite5bcc72049aa59a41cbf3ec8aaaa8994c62a227b (patch)
treeba07ee540dfbc9edbf0074554aa6594c61553f27
parent00367b2243064268062cd094f43e1271fca09c5e (diff)
downloadcoreboot-e5bcc72049aa59a41cbf3ec8aaaa8994c62a227b.tar.xz
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 <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40940 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Frans Hendriks <fhendriks@eltan.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
-rw-r--r--src/acpi/Makefile.inc8
-rw-r--r--src/arch/x86/Makefile.inc9
2 files changed, 8 insertions, 9 deletions
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 ?=