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/superio/aspeed/ast2400/superio.c     | 2 +-
 src/superio/common/conf_mode.c           | 2 +-
 src/superio/common/generic.c             | 2 +-
 src/superio/common/ssdt.c                | 4 ++--
 src/superio/nuvoton/nct5539d/superio.c   | 2 +-
 src/superio/nuvoton/nct5572d/superio.c   | 2 +-
 src/superio/nuvoton/nct6791d/superio.c   | 2 +-
 src/superio/nuvoton/npcd378/superio.c    | 4 ++--
 src/superio/winbond/w83667hg-a/superio.c | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/superio')

diff --git a/src/superio/aspeed/ast2400/superio.c b/src/superio/aspeed/ast2400/superio.c
index a896b643c6..4b5d51dc2b 100644
--- a/src/superio/aspeed/ast2400/superio.c
+++ b/src/superio/aspeed/ast2400/superio.c
@@ -6,7 +6,7 @@
 #include <superio/conf_mode.h>
 #include <pc80/keyboard.h>
 #include <superio/common/ssdt.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include "ast2400.h"
 #include "chip.h"
 
diff --git a/src/superio/common/conf_mode.c b/src/superio/common/conf_mode.c
index 83cf074fe1..ca6b1bdf2c 100644
--- a/src/superio/common/conf_mode.c
+++ b/src/superio/common/conf_mode.c
@@ -4,7 +4,7 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <superio/conf_mode.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 
 /* Common enter/exit implementations */
 
diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c
index cffe0c3476..d992830621 100644
--- a/src/superio/common/generic.c
+++ b/src/superio/common/generic.c
@@ -3,7 +3,7 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 
 static void generic_set_resources(struct device *dev)
diff --git a/src/superio/common/ssdt.c b/src/superio/common/ssdt.c
index 9ff02fb3af..90d4461960 100644
--- a/src/superio/common/ssdt.c
+++ b/src/superio/common/ssdt.c
@@ -5,8 +5,8 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <arch/acpigen.h>
-#include <arch/acpi.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpi.h>
 #include <device/pnp_def.h>
 #include <console/console.h>
 #include <types.h>
diff --git a/src/superio/nuvoton/nct5539d/superio.c b/src/superio/nuvoton/nct5539d/superio.c
index 9a620c97ee..95e2e27836 100644
--- a/src/superio/nuvoton/nct5539d/superio.c
+++ b/src/superio/nuvoton/nct5539d/superio.c
@@ -9,7 +9,7 @@
 
 #if CONFIG(HAVE_ACPI_TABLES)
 #include <superio/common/ssdt.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #endif
 
 static void nct5539d_init(struct device *dev)
diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c
index fe1da65db2..4f83d1029f 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -6,7 +6,7 @@
 #include <device/pnp.h>
 #include <pc80/keyboard.h>
 #include <option.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <superio/conf_mode.h>
 
 #include "nct5572d.h"
diff --git a/src/superio/nuvoton/nct6791d/superio.c b/src/superio/nuvoton/nct6791d/superio.c
index e04a9232ae..7d4e90cc74 100644
--- a/src/superio/nuvoton/nct6791d/superio.c
+++ b/src/superio/nuvoton/nct6791d/superio.c
@@ -6,7 +6,7 @@
 #include <pc80/keyboard.h>
 #include <superio/conf_mode.h>
 #include <superio/common/ssdt.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include "nct6791d.h"
 
 static void nct6791d_init(struct device *dev)
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c
index 8f5975ba26..6feee5e9da 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -8,8 +8,8 @@
 #include <option.h>
 #include <pc80/keyboard.h>
 #include <superio/conf_mode.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #include <superio/common/ssdt.h>
 #include <stdlib.h>
 
diff --git a/src/superio/winbond/w83667hg-a/superio.c b/src/superio/winbond/w83667hg-a/superio.c
index 685062170d..54f88551e4 100644
--- a/src/superio/winbond/w83667hg-a/superio.c
+++ b/src/superio/winbond/w83667hg-a/superio.c
@@ -6,7 +6,7 @@
 #include <device/pnp.h>
 #include <pc80/keyboard.h>
 #include <option.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <superio/conf_mode.h>
 
 #include "w83667hg-a.h"
-- 
cgit v1.2.3