HAOUAS Elyes has uploaded this change for review.
src: Drop Drop unused 'include <arch/acpigen.h>'
Use <arch/acpi.h> when appropriate.
Change-Id: I05a28d2c15565c21407101e611ee1984c5411ff0
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/mainboard/adi/rcc-dff/acpi_tables.c
M src/mainboard/amd/bettong/acpi_tables.c
M src/mainboard/amd/db-ft3b-lc/acpi_tables.c
M src/mainboard/amd/inagua/acpi_tables.c
M src/mainboard/amd/lamar/acpi_tables.c
M src/mainboard/amd/mahogany_fam10/acpi_tables.c
M src/mainboard/amd/olivehill/acpi_tables.c
M src/mainboard/amd/olivehillplus/acpi_tables.c
M src/mainboard/amd/parmer/acpi_tables.c
M src/mainboard/amd/persimmon/acpi_tables.c
M src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
M src/mainboard/amd/south_station/acpi_tables.c
M src/mainboard/amd/thatcher/acpi_tables.c
M src/mainboard/amd/union_station/acpi_tables.c
M src/mainboard/apple/macbook21/mainboard.c
M src/mainboard/asrock/e350m1/acpi_tables.c
M src/mainboard/asrock/imb-a180/acpi_tables.c
M src/mainboard/asus/am1i-a/acpi_tables.c
M src/mainboard/asus/f2a85-m/acpi_tables.c
M src/mainboard/asus/m4a785-m/acpi_tables.c
M src/mainboard/bap/ode_e20XX/acpi_tables.c
M src/mainboard/bap/ode_e21XX/acpi_tables.c
M src/mainboard/biostar/a68n_5200/acpi_tables.c
M src/mainboard/biostar/am1ml/acpi_tables.c
M src/mainboard/elmex/pcm205400/acpi_tables.c
M src/mainboard/emulation/qemu-i440fx/acpi_tables.c
M src/mainboard/emulation/qemu-i440fx/fw_cfg.c
M src/mainboard/emulation/qemu-q35/acpi_tables.c
M src/mainboard/esd/atom15/acpi_tables.c
M src/mainboard/getac/p470/acpi_tables.c
M src/mainboard/gizmosphere/gizmo/acpi_tables.c
M src/mainboard/gizmosphere/gizmo2/acpi_tables.c
M src/mainboard/google/auron/acpi_tables.c
M src/mainboard/google/beltino/acpi_tables.c
M src/mainboard/google/jecht/acpi_tables.c
M src/mainboard/google/parrot/acpi_tables.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/google/slippy/acpi_tables.c
M src/mainboard/google/stout/acpi_tables.c
M src/mainboard/hp/abm/acpi_tables.c
M src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
M src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
M src/mainboard/intel/baskingridge/acpi_tables.c
M src/mainboard/intel/bayleybay_fsp/acpi_tables.c
M src/mainboard/intel/emeraldlake2/acpi_tables.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/littleplains/acpi_tables.c
M src/mainboard/intel/minnowmax/acpi_tables.c
M src/mainboard/intel/mohonpeak/acpi_tables.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/intel/wtm2/acpi_tables.c
M src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
M src/mainboard/lenovo/g505s/acpi_tables.c
M src/mainboard/lenovo/t400/acpi_tables.c
M src/mainboard/lenovo/x200/acpi_tables.c
M src/mainboard/lippert/frontrunner-af/acpi_tables.c
M src/mainboard/lippert/toucan-af/acpi_tables.c
M src/mainboard/msi/ms7721/acpi_tables.c
M src/mainboard/opencellular/rotundu/acpi_tables.c
M src/mainboard/pcengines/apu1/acpi_tables.c
M src/mainboard/pcengines/apu2/acpi_tables.c
M src/mainboard/purism/librem_bdw/acpi_tables.c
M src/mainboard/roda/rk9/acpi_tables.c
M src/mainboard/samsung/lumpy/acpi_tables.c
M src/mainboard/samsung/stumpy/acpi_tables.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/mainboard/siemens/mc_tcu3/acpi_tables.c
M src/soc/amd/stoneyridge/i2c.c
M src/soc/intel/apollolake/graphics.c
M src/soc/intel/braswell/southcluster.c
M src/soc/intel/cannonlake/graphics.c
M src/soc/intel/common/block/cpu/cpulib.c
M src/soc/intel/fsp_baytrail/southcluster.c
M src/soc/intel/icelake/graphics.c
M src/southbridge/amd/sb700/lpc.c
M src/southbridge/intel/ibexpeak/madt.c
M src/southbridge/nvidia/mcp55/lpc.c
77 files changed, 5 insertions(+), 86 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/31781/1
diff --git a/src/mainboard/adi/rcc-dff/acpi_tables.c b/src/mainboard/adi/rcc-dff/acpi_tables.c
index bc5f953..a0ebbba 100644
--- a/src/mainboard/adi/rcc-dff/acpi_tables.c
+++ b/src/mainboard/adi/rcc-dff/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index 676318d..b0f297c 100644
--- a/src/mainboard/amd/bettong/acpi_tables.c
+++ b/src/mainboard/amd/bettong/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
index 6188cd2..0b9e0c4 100644
--- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index 74be72f..f18a2aa 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c
index cfae02e..1bbd390 100644
--- a/src/mainboard/amd/lamar/acpi_tables.c
+++ b/src/mainboard/amd/lamar/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index f5c6546..c907d68 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index 84ad76e..0b9e0c4 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.c
@@ -15,11 +15,9 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-
unsigned long acpi_fill_madt(unsigned long current)
{
/* create all subtables for processors */
diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c
index 6188cd2..0b9e0c4 100644
--- a/src/mainboard/amd/olivehillplus/acpi_tables.c
+++ b/src/mainboard/amd/olivehillplus/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index cd28d9d..3ff68e3 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index 5727da8..f18a2aa 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.c
@@ -15,11 +15,9 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-
unsigned long acpi_fill_madt(unsigned long current)
{
/* create all subtables for processors */
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
index fee0109..ac91940 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
@@ -13,7 +13,6 @@
#include <device/device.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include "mainboard.h"
static void mainboard_enable(struct device *dev)
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index 74be72f..f18a2aa 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index cd28d9d..3ff68e3 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index 74be72f..f18a2aa 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index 25c4660..f1095c2 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -21,7 +21,7 @@
#include <device/pci_ops.h>
#include <arch/interrupt.h>
#include <northbridge/intel/i945/i945.h>
-#include <arch/acpigen.h>
+#include <arch/acpi.h>
#include <drivers/intel/gma/int15.h>
#include <ec/acpi/ec.h>
#define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index a61d91e..bc9c154 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*/
-
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <string.h>
diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index 84ad76e..0b9e0c4 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.c
@@ -15,11 +15,9 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-
unsigned long acpi_fill_madt(unsigned long current)
{
/* create all subtables for processors */
diff --git a/src/mainboard/asus/am1i-a/acpi_tables.c b/src/mainboard/asus/am1i-a/acpi_tables.c
index 68cd239..12a20ea 100644
--- a/src/mainboard/asus/am1i-a/acpi_tables.c
+++ b/src/mainboard/asus/am1i-a/acpi_tables.c
@@ -15,11 +15,9 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-
unsigned long acpi_fill_madt(unsigned long current)
{
/* create all subtables for processors */
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index f94fde0..7338eee 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*/
-
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <string.h>
diff --git a/src/mainboard/asus/m4a785-m/acpi_tables.c b/src/mainboard/asus/m4a785-m/acpi_tables.c
index a091210..ec04eff 100644
--- a/src/mainboard/asus/m4a785-m/acpi_tables.c
+++ b/src/mainboard/asus/m4a785-m/acpi_tables.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index 84ad76e..f23d3b6 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c
index 6188cd2..0b9e0c4 100644
--- a/src/mainboard/bap/ode_e21XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/biostar/a68n_5200/acpi_tables.c b/src/mainboard/biostar/a68n_5200/acpi_tables.c
index 84ad76e..f23d3b6 100644
--- a/src/mainboard/biostar/a68n_5200/acpi_tables.c
+++ b/src/mainboard/biostar/a68n_5200/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index 68cd239..3a6248c 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c
index 5727da8..466e4b1 100644
--- a/src/mainboard/elmex/pcm205400/acpi_tables.c
+++ b/src/mainboard/elmex/pcm205400/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
index abd2633..2829289 100644
--- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
@@ -16,7 +16,6 @@
#include <types.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
index 508fcca..a83c581 100644
--- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
@@ -16,7 +16,7 @@
#include <smbios.h>
#include <console/console.h>
#include <arch/io.h>
-#include <arch/acpigen.h>
+#include <arch/acpi.h>
#include <commonlib/endian.h>
#include "fw_cfg.h"
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 6acbaf7..2c6a2ec 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index bdb201c..edb66fc0 100644
--- a/src/mainboard/esd/atom15/acpi_tables.c
+++ b/src/mainboard/esd/atom15/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index 162c20a..57e2911 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <console/console.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index 644ab96..39d9096 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
@@ -16,7 +16,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index 84ad76e..f23d3b6 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/auron/acpi_tables.c b/src/mainboard/google/auron/acpi_tables.c
index 4bb0239..7d4d21e 100644
--- a/src/mainboard/google/auron/acpi_tables.c
+++ b/src/mainboard/google/auron/acpi_tables.c
@@ -14,7 +14,7 @@
*/
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
+#include <arch/acpi.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
#include <variant/thermal.h>
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index f7b51a9..ca8951f 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -16,7 +16,6 @@
#include <string.h>
#include <types.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 9bc1816..5918256 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 61dcde1..d9a3ff7 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -16,7 +16,6 @@
#include <types.h>
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index d9f511a..3837a52 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index 0ffd054..21852d5 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 9fbdcfc..b5653aa 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -16,7 +16,6 @@
#include <types.h>
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index 84ad76e..f23d3b6 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index f94fde0..a840fe8 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -15,7 +15,6 @@
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <string.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
index f5c6546..c907d68 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index c5293dc..48d224d 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 0a16565..2903a5c 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index d5deff0..666d48d 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -16,7 +16,6 @@
#include <types.h>
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index c0e830d..6be920b 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -19,7 +19,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/littleplains/acpi_tables.c b/src/mainboard/intel/littleplains/acpi_tables.c
index bc5f953..a0ebbba 100644
--- a/src/mainboard/intel/littleplains/acpi_tables.c
+++ b/src/mainboard/intel/littleplains/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index bdb201c..edb66fc0 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/mohonpeak/acpi_tables.c b/src/mainboard/intel/mohonpeak/acpi_tables.c
index bc5f953..a0ebbba 100644
--- a/src/mainboard/intel/mohonpeak/acpi_tables.c
+++ b/src/mainboard/intel/mohonpeak/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 62fcc19..29c5de7 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index 16cd0c6..39bf213 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index a61d91e..bc9c154 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details.
*/
-
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <string.h>
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index f94fde0..a840fe8 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.c
@@ -15,7 +15,6 @@
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <string.h>
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 4563647..301ca50 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 4563647..301ca50 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index 74be72f..f18a2aa 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index 74be72f..f18a2aa 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/msi/ms7721/acpi_tables.c b/src/mainboard/msi/ms7721/acpi_tables.c
index f94fde0..a840fe8 100644
--- a/src/mainboard/msi/ms7721/acpi_tables.c
+++ b/src/mainboard/msi/ms7721/acpi_tables.c
@@ -15,7 +15,6 @@
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
#include <string.h>
diff --git a/src/mainboard/opencellular/rotundu/acpi_tables.c b/src/mainboard/opencellular/rotundu/acpi_tables.c
index 4f95bff..7f6abd9 100644
--- a/src/mainboard/opencellular/rotundu/acpi_tables.c
+++ b/src/mainboard/opencellular/rotundu/acpi_tables.c
@@ -17,7 +17,6 @@
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index 5727da8..466e4b1 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/pcengines/apu2/acpi_tables.c b/src/mainboard/pcengines/apu2/acpi_tables.c
index 6188cd2..0b9e0c4 100644
--- a/src/mainboard/pcengines/apu2/acpi_tables.c
+++ b/src/mainboard/pcengines/apu2/acpi_tables.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/purism/librem_bdw/acpi_tables.c b/src/mainboard/purism/librem_bdw/acpi_tables.c
index b51be02..918398e 100644
--- a/src/mainboard/purism/librem_bdw/acpi_tables.c
+++ b/src/mainboard/purism/librem_bdw/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/ioapic.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
diff --git a/src/mainboard/roda/rk9/acpi_tables.c b/src/mainboard/roda/rk9/acpi_tables.c
index 6132143..0700ca0 100644
--- a/src/mainboard/roda/rk9/acpi_tables.c
+++ b/src/mainboard/roda/rk9/acpi_tables.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index e1364b6..389695c 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -16,7 +16,6 @@
#include <types.h>
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index ad3b29c..b21ae22 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -16,7 +16,6 @@
#include <types.h>
#include <string.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index c0e830d..6be920b 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -19,7 +19,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index 0a16565..2903a5c 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c
index 45057a0..e99f3509f 100644
--- a/src/soc/amd/stoneyridge/i2c.c
+++ b/src/soc/amd/stoneyridge/i2c.c
@@ -14,7 +14,6 @@
*/
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <console/console.h>
#include <drivers/i2c/designware/dw_i2c.h>
#include <soc/iomap.h>
diff --git a/src/soc/intel/apollolake/graphics.c b/src/soc/intel/apollolake/graphics.c
index 9be598f..0239f29 100644
--- a/src/soc/intel/apollolake/graphics.c
+++ b/src/soc/intel/apollolake/graphics.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <bootmode.h>
#include <console/console.h>
#include <fsp/util.h>
diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c
index 22fe853..dc204f3 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -20,7 +20,6 @@
#include <device/mmio.h>
#include <device/pci_ops.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <bootstate.h>
#include "chip.h"
#include <console/console.h>
diff --git a/src/soc/intel/cannonlake/graphics.c b/src/soc/intel/cannonlake/graphics.c
index 2b3c900..88ad7f0 100644
--- a/src/soc/intel/cannonlake/graphics.c
+++ b/src/soc/intel/cannonlake/graphics.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpigen.h>
+#include <arch/acpi.h>
#include <console/console.h>
#include <fsp/util.h>
#include <device/device.h>
diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index 61ad7ed..e448fe2 100644
--- a/src/soc/intel/common/block/cpu/cpulib.c
+++ b/src/soc/intel/common/block/cpu/cpulib.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/acpigen.h>
#include <console/console.h>
#include <cpu/intel/turbo.h>
#include <cpu/x86/msr.h>
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index 8fce928..6b95767 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -41,7 +41,6 @@
#include <soc/ramstage.h>
#include "chip.h"
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#define ENABLE_ACPI_MODE_IN_COREBOOT 0
#define TEST_SMM_FLASH_LOCKDOWN 0
diff --git a/src/soc/intel/icelake/graphics.c b/src/soc/intel/icelake/graphics.c
index f0ad0e2..7cddeb5 100644
--- a/src/soc/intel/icelake/graphics.c
+++ b/src/soc/intel/icelake/graphics.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpigen.h>
+#include <arch/acpi.h>
#include <console/console.h>
#include <fsp/util.h>
#include <device/device.h>
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c
index 2ebd7a5..f12b937 100644
--- a/src/southbridge/amd/sb700/lpc.c
+++ b/src/southbridge/amd/sb700/lpc.c
@@ -24,7 +24,6 @@
#include <pc80/i8254.h>
#include <pc80/i8259.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <pc80/isa-dma.h>
#include <arch/ioapic.h>
#include <cpu/amd/powernow.h>
diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c
index 0affa79..f7286bc 100644
--- a/src/southbridge/intel/ibexpeak/madt.c
+++ b/src/southbridge/intel/ibexpeak/madt.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
-#include <arch/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/southbridge/nvidia/mcp55/lpc.c b/src/southbridge/nvidia/mcp55/lpc.c
index 7e0fc89..f93c515 100644
--- a/src/southbridge/nvidia/mcp55/lpc.c
+++ b/src/southbridge/nvidia/mcp55/lpc.c
@@ -32,9 +32,6 @@
#include <cpu/x86/lapic.h>
#include <arch/acpi.h>
#include <stdlib.h>
-#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
-#include <arch/acpigen.h>
-#endif
#include <cpu/amd/powernow.h>
#include "mcp55.h"
To view, visit change 31781. To unsubscribe, or for help writing mail filters, visit settings.