src: Use 'include <boot/coreboot_tables.h>' when appropriate
Change-Id: I3d90e46ed391ce323436750c866a0afc3879e2e6
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36359
Reviewed-by: Martin Roth <martinroth@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/device/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c
index 9a7fa04..a3d736f 100644
--- a/src/device/oprom/yabel/vbe.c
+++ b/src/device/oprom/yabel/vbe.c
@@ -32,6 +32,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
+#include <boot/coreboot_tables.h>
#include <string.h>
#include <types.h>
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c
index e4762e9..f49b72c 100644
--- a/src/drivers/emulation/qemu/bochs.c
+++ b/src/drivers/emulation/qemu/bochs.c
@@ -15,7 +15,6 @@
#include <edid.h>
#include <stdlib.h>
#include <arch/io.h>
-#include <boot/coreboot_tables.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c
index 1d4db8e..c36ce2f 100644
--- a/src/drivers/emulation/qemu/cirrus.c
+++ b/src/drivers/emulation/qemu/cirrus.c
@@ -15,7 +15,6 @@
#include <stdint.h>
#include <edid.h>
#include <stdlib.h>
-#include <boot/coreboot_tables.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c
index 2bafbd6..be7afdb 100644
--- a/src/drivers/intel/fsp2_0/graphics.c
+++ b/src/drivers/intel/fsp2_0/graphics.c
@@ -12,6 +12,7 @@
* GNU General Public License for more details.
*/
+#include <boot/coreboot_tables.h>
#include <console/console.h>
#include <fsp/util.h>
#include <soc/intel/common/vbt.h>
diff --git a/src/drivers/intel/gma/intel_ddi.c b/src/drivers/intel/gma/intel_ddi.c
index 9e9bd972..563f01b 100644
--- a/src/drivers/intel/gma/intel_ddi.c
+++ b/src/drivers/intel/gma/intel_ddi.c
@@ -32,7 +32,6 @@
#include <device/pci_def.h>
#include <console/console.h>
#include <arch/acpi.h>
-#include <boot/coreboot_tables.h>
#include <smbios.h>
#include <device/pci.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c
index abf8b25..6edffe0 100644
--- a/src/drivers/pc80/rtc/mc146818rtc.c
+++ b/src/drivers/pc80/rtc/mc146818rtc.c
@@ -18,7 +18,6 @@
#include <version.h>
#include <console/console.h>
#include <pc80/mc146818rtc.h>
-#include <boot/coreboot_tables.h>
#include <rtc.h>
#include <string.h>
#include <cbfs.h>
diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index cdaa5b3..88867fd 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -15,6 +15,7 @@
#include <arch/early_variables.h>
#include <assert.h>
#include <boot_device.h>
+#include <boot/coreboot_tables.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <stdlib.h>
diff --git a/src/drivers/uart/oxpcie_early.c b/src/drivers/uart/oxpcie_early.c
index 0c5d7b5..f6b4040 100644
--- a/src/drivers/uart/oxpcie_early.c
+++ b/src/drivers/uart/oxpcie_early.c
@@ -15,7 +15,6 @@
#include <stddef.h>
#include <device/pci_ops.h>
#include <arch/early_variables.h>
-#include <boot/coreboot_tables.h>
#include <console/uart.h>
#include <device/pci.h>
#include <device/pci_def.h>
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h
index 5ebbdd4..a850087 100644
--- a/src/drivers/xgi/common/xgi_coreboot.h
+++ b/src/drivers/xgi/common/xgi_coreboot.h
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <arch/io.h>
+#include <boot/coreboot_tables.h>
#include <delay.h>
#include <device/mmio.h>
#include <console/console.h>
diff --git a/src/include/boot/tables.h b/src/include/boot/tables.h
index 9e82e3f..b440c8b 100644
--- a/src/include/boot/tables.h
+++ b/src/include/boot/tables.h
@@ -1,7 +1,7 @@
#ifndef BOOT_TABLES_H
#define BOOT_TABLES_H
-#include <boot/coreboot_tables.h>
+#include <stdint.h>
/*
* Write architecture specific tables as well as the common
diff --git a/src/include/vbe.h b/src/include/vbe.h
index cfae7e4..9497ec6 100644
--- a/src/include/vbe.h
+++ b/src/include/vbe.h
@@ -13,7 +13,8 @@
#ifndef VBE_H
#define VBE_H
-#include <boot/coreboot_tables.h>
+#include <stdint.h>
+
// these structs are for input from and output to OF
typedef struct {
u8 display_type; // 0 = NONE, 1 = analog, 2 = digital
diff --git a/src/lib/edid.c b/src/lib/edid.c
index 964dce2..fd7f5ba 100644
--- a/src/lib/edid.c
+++ b/src/lib/edid.c
@@ -36,7 +36,6 @@
#include <string.h>
#include <stdlib.h>
#include <edid.h>
-#include <boot/coreboot_tables.h>
#include <vbe.h>
struct edid_context {
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index f04e086..be135c2 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <boot/coreboot_tables.h>
#include <bootstate.h>
#include <bootmem.h>
#include <console/console.h>
diff --git a/src/mainboard/emulation/spike-riscv/uart.c b/src/mainboard/emulation/spike-riscv/uart.c
index eeb0b57..b44c7b3 100644
--- a/src/mainboard/emulation/spike-riscv/uart.c
+++ b/src/mainboard/emulation/spike-riscv/uart.c
@@ -15,7 +15,6 @@
#include <types.h>
#include <console/uart.h>
-#include <boot/coreboot_tables.h>
uintptr_t uart_platform_base(int idx)
{
diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index f193d83..e6cc01f 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -17,7 +17,6 @@
#include <types.h>
#include <arch/acpi.h>
#include <arch/io.h>
-#include <boot/coreboot_tables.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 067ea4e..b5f96b4 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -24,7 +24,6 @@
#include <fmap.h>
#include <arch/acpi.h>
#include <arch/io.h>
-#include <boot/coreboot_tables.h>
#include "onboard.h"
#include "ec.h"
#include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/google/foster/mainboard.c b/src/mainboard/google/foster/mainboard.c
index daddf5c..14de42e 100644
--- a/src/mainboard/google/foster/mainboard.c
+++ b/src/mainboard/google/foster/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <arch/mmu.h>
-#include <boot/coreboot_tables.h>
#include <device/device.h>
#include <memrange.h>
#include <soc/addressmap.h>
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 37d1a67..a91930b 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -25,7 +25,6 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <arch/interrupt.h>
-#include <boot/coreboot_tables.h>
#include "onboard.h"
#include "ec.h"
#include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c
index 916632e..421826c 100644
--- a/src/mainboard/google/oak/mainboard.c
+++ b/src/mainboard/google/oak/mainboard.c
@@ -15,7 +15,6 @@
#include <arch/cache.h>
#include <boardid.h>
-#include <boot/coreboot_tables.h>
#include <bootmode.h>
#include <console/console.h>
#include <delay.h>
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 5f6b09d..361215a 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -20,7 +20,6 @@
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
#include <arch/io.h>
-#include <boot/coreboot_tables.h>
#include "onboard.h"
#include "ec.h"
#include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index 30be5f7..64dc99f 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -23,7 +23,6 @@
#endif
#include <arch/acpi.h>
#include <arch/interrupt.h>
-#include <boot/coreboot_tables.h>
#include <smbios.h>
#include "ec.h"
#include <variant/onboard.h>
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index cf025d1..4c50ea6 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -21,7 +21,6 @@
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
#include <arch/io.h>
-#include <boot/coreboot_tables.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index ac35602..782546a 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -20,7 +20,6 @@
#include <device/pci_ops.h>
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
-#include <boot/coreboot_tables.h>
#include <southbridge/intel/bd82x6x/pch.h>
#include <device/pci.h>
#include <ec/quanta/it8518/ec.h>
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index e0fa7eb..37af13f 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -20,7 +20,6 @@
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
#include <arch/io.h>
-#include <boot/coreboot_tables.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/mainboard.c b/src/mainboard/intel/bayleybay_fsp/mainboard.c
index 2ffb137..f6ba035 100644
--- a/src/mainboard/intel/bayleybay_fsp/mainboard.c
+++ b/src/mainboard/intel/bayleybay_fsp/mainboard.c
@@ -20,7 +20,6 @@
#if CONFIG(VGA_ROM_RUN)
#include <x86emu/x86emu.h>
#endif
-#include <boot/coreboot_tables.h>
/*
* mainboard_enable is executed as first thing after enumerate_buses().
diff --git a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
index e497bdb..29f98f4 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
+++ b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
@@ -20,7 +20,6 @@
#if CONFIG(VGA_ROM_RUN)
#include <x86emu/x86emu.h>
#endif
-#include <boot/coreboot_tables.h>
/*
* mainboard_enable is executed as first thing after enumerate_buses().
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index 5a64e07..210588c 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -19,7 +19,6 @@
#include <device/pci_def.h>
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
-#include <boot/coreboot_tables.h>
#include <southbridge/intel/bd82x6x/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index 0e9217d..ce16815 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -20,7 +20,6 @@
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
#include <arch/io.h>
-#include <boot/coreboot_tables.h>
#include <vendorcode/google/chromeos/chromeos.h>
void mainboard_suspend_resume(void)
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 675cb05..ee83b1b 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -24,7 +24,6 @@
#endif
#include <pc80/mc146818rtc.h>
#include <arch/interrupt.h>
-#include <boot/coreboot_tables.h>
#include <southbridge/intel/bd82x6x/pch.h>
#if CONFIG(VGA_ROM_RUN)
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index f793963..c64a51b 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -20,7 +20,6 @@
#include <device/pci_def.h>
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
-#include <boot/coreboot_tables.h>
#include <ec/smsc/mec1308/ec.h>
#include "ec.h"
#include "onboard.h"
diff --git a/src/mainboard/siemens/mc_bdx1/mainboard.c b/src/mainboard/siemens/mc_bdx1/mainboard.c
index 5cef53c..4f9c840 100644
--- a/src/mainboard/siemens/mc_bdx1/mainboard.c
+++ b/src/mainboard/siemens/mc_bdx1/mainboard.c
@@ -27,7 +27,6 @@
#include <x86emu/x86emu.h>
#endif
#include <device/mmio.h>
-#include <boot/coreboot_tables.h>
#include <hwilib.h>
#include <i210.h>
#include <soc/pci_devs.h>
diff --git a/src/mainboard/siemens/mc_tcu3/mainboard.c b/src/mainboard/siemens/mc_tcu3/mainboard.c
index e77c0b1..955193f 100644
--- a/src/mainboard/siemens/mc_tcu3/mainboard.c
+++ b/src/mainboard/siemens/mc_tcu3/mainboard.c
@@ -21,7 +21,6 @@
#if CONFIG(VGA_ROM_RUN)
#include <x86emu/x86emu.h>
#endif
-#include <boot/coreboot_tables.h>
#include <hwilib.h>
#include <i210.h>
#include "lcd_panel.h"
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index cbd7a2e..2d35c6b 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <boot/coreboot_tables.h>
#include <boot_device.h>
#include <cbmem.h>
#include <console/cbmem_console.h>
diff --git a/src/soc/nvidia/tegra210/mtc.c b/src/soc/nvidia/tegra210/mtc.c
index 97eb3de..2973518 100644
--- a/src/soc/nvidia/tegra210/mtc.c
+++ b/src/soc/nvidia/tegra210/mtc.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <boot/coreboot_tables.h>
#include <cbfs.h>
#include <cbmem.h>
#include <console/console.h>