From 76cedd2c292352d7dbd45fab70ec272e476d0910 Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@google.com>
Date: Sat, 2 May 2020 10:24:23 -0700
Subject: acpi: Move ACPI table support out of arch/x86 (3/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 3/5 which basically is generated by
running the following command:
$ git grep -iIl "arch/acpi" | xargs sed -i 's/arch\/acpi/acpi\/acpi/g'

BUG=b:155428745

Change-Id: I16b1c45d954d6440fb9db1d3710063a47b582eae
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40938
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
---
 src/arch/x86/acpi/debug.asl              | 2 +-
 src/arch/x86/acpi_bert_storage.c         | 2 +-
 src/arch/x86/acpi_s3.c                   | 2 +-
 src/arch/x86/ebda.c                      | 2 +-
 src/arch/x86/include/arch/bert_storage.h | 2 +-
 src/arch/x86/tables.c                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/arch/x86')

diff --git a/src/arch/x86/acpi/debug.asl b/src/arch/x86/acpi/debug.asl
index cde807c17f..2c1d2ce471 100644
--- a/src/arch/x86/acpi/debug.asl
+++ b/src/arch/x86/acpi/debug.asl
@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 /*
-	#include <arch/acpi.h>
+	#include <acpi/acpi.h>
 	DefinitionBlock (
 		"DSDT.AML",
 		"DSDT",
diff --git a/src/arch/x86/acpi_bert_storage.c b/src/arch/x86/acpi_bert_storage.c
index a7061fa7c5..c5f98f7ea8 100644
--- a/src/arch/x86/acpi_bert_storage.c
+++ b/src/arch/x86/acpi_bert_storage.c
@@ -7,7 +7,7 @@
 #include <cpu/x86/name.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/bert_storage.h>
 #include <string.h>
 
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index bf17980020..39e3a056cd 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -3,7 +3,7 @@
 
 #include <console/console.h>
 #include <string.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/cpu.h>
 #include <cbmem.h>
 #include <commonlib/helpers.h>
diff --git a/src/arch/x86/ebda.c b/src/arch/x86/ebda.c
index 4ac1359faa..99aa2d3f16 100644
--- a/src/arch/x86/ebda.c
+++ b/src/arch/x86/ebda.c
@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #include <stdint.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/ebda.h>
 #include <commonlib/endian.h>
 #include <console/console.h>
diff --git a/src/arch/x86/include/arch/bert_storage.h b/src/arch/x86/include/arch/bert_storage.h
index 3e7b0b560c..d088f02ee9 100644
--- a/src/arch/x86/include/arch/bert_storage.h
+++ b/src/arch/x86/include/arch/bert_storage.h
@@ -5,7 +5,7 @@
 #define _BERT_STORAGE_H_
 
 #include <stdint.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 
 /* Items in the BERT region
  *
diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c
index 7e653f7245..3affd75761 100644
--- a/src/arch/x86/tables.c
+++ b/src/arch/x86/tables.c
@@ -8,7 +8,7 @@
 #include <boot/coreboot_tables.h>
 #include <arch/pirq_routing.h>
 #include <arch/smp/mpspec.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <commonlib/helpers.h>
 #include <string.h>
 #include <cbmem.h>
-- 
cgit v1.2.3