summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2018-10-04 23:42:42 +0200
committerNico Huber <nico.h@gmx.de>2018-10-08 16:57:27 +0000
commitd44221f9c8f3686e040ff9481829315068b321a3 (patch)
tree76337bf1cae88feda44e3c63dd7e32e964e8767d /src/arch/x86
parent834543c0c71544b547194b093b8e1da990722762 (diff)
downloadcoreboot-d44221f9c8f3686e040ff9481829315068b321a3.tar.xz
Move compiler.h to commonlib
Its spreading copies got out of sync. And as it is not a standard header but used in commonlib code, it belongs into commonlib. While we are at it, always include it via GCC's `-include` switch. Some Windows and BSD quirk handling went into the util copies. We always guard from redefinitions now to prevent further issues. Change-Id: I850414e6db1d799dce71ff2dc044e6a000ad2552 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/28927 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/acpi.c1
-rw-r--r--src/arch/x86/acpi_s3.c1
-rw-r--r--src/arch/x86/acpigen.c1
-rw-r--r--src/arch/x86/cbmem.c1
-rw-r--r--src/arch/x86/exception.c1
-rw-r--r--src/arch/x86/gdt.c1
-rw-r--r--src/arch/x86/include/arch/acpi.h1
-rw-r--r--src/arch/x86/include/arch/hlt.h2
-rw-r--r--src/arch/x86/include/arch/io.h1
-rw-r--r--src/arch/x86/include/arch/pci_io_cfg.h1
-rw-r--r--src/arch/x86/include/arch/pci_mmio_cfg.h1
-rw-r--r--src/arch/x86/include/arch/pirq_routing.h1
-rw-r--r--src/arch/x86/include/arch/registers.h2
-rw-r--r--src/arch/x86/include/arch/smp/atomic.h2
-rw-r--r--src/arch/x86/include/arch/smp/mpspec.h1
-rw-r--r--src/arch/x86/include/arch/smp/spinlock.h2
-rw-r--r--src/arch/x86/mpspec.c1
-rw-r--r--src/arch/x86/pirq_routing.c1
-rw-r--r--src/arch/x86/postcar.c1
-rw-r--r--src/arch/x86/smbios.c1
-rw-r--r--src/arch/x86/timestamp.c1
21 files changed, 0 insertions, 25 deletions
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index d75d889513..1b430041f7 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -44,7 +44,6 @@
#include <arch/acpigen.h>
#include <device/pci.h>
#include <cbmem.h>
-#include <compiler.h>
#include <cpu/x86/lapic_def.h>
#include <cpu/cpu.h>
#include <cbfs.h>
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index ebf291cdce..71267f033b 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <cbmem.h>
-#include <compiler.h>
#include <cpu/cpu.h>
#include <fallback.h>
#include <timestamp.h>
diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c
index a630ef2118..de3d39e3b4 100644
--- a/src/arch/x86/acpigen.c
+++ b/src/arch/x86/acpigen.c
@@ -28,7 +28,6 @@
#include <lib.h>
#include <string.h>
#include <arch/acpigen.h>
-#include <compiler.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/arch/x86/cbmem.c b/src/arch/x86/cbmem.c
index 52f8f8a5de..b3d89f4953 100644
--- a/src/arch/x86/cbmem.c
+++ b/src/arch/x86/cbmem.c
@@ -13,7 +13,6 @@
#include <stdlib.h>
#include <cbmem.h>
-#include <compiler.h>
#include <arch/acpi.h>
#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
diff --git a/src/arch/x86/exception.c b/src/arch/x86/exception.c
index 201e835e16..a281c54c1d 100644
--- a/src/arch/x86/exception.c
+++ b/src/arch/x86/exception.c
@@ -15,7 +15,6 @@
#include <arch/early_variables.h>
#include <arch/exception.h>
#include <commonlib/helpers.h>
-#include <compiler.h>
#include <console/console.h>
#include <console/streams.h>
#include <cpu/x86/cr.h>
diff --git a/src/arch/x86/gdt.c b/src/arch/x86/gdt.c
index 24a1c81072..83ab858e22 100644
--- a/src/arch/x86/gdt.c
+++ b/src/arch/x86/gdt.c
@@ -15,7 +15,6 @@
#include <types.h>
#include <string.h>
-#include <compiler.h>
#include <cbmem.h>
#include <console/console.h>
#include <cpu/x86/gdt.h>
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index c84adda0d0..54be1f40b7 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -54,7 +54,6 @@
#if !defined(__ASSEMBLER__) && !defined(__ACPI__) && !defined(__ROMCC__)
#include <stdint.h>
-#include <compiler.h>
#include <rules.h>
#include <commonlib/helpers.h>
#include <device/device.h>
diff --git a/src/arch/x86/include/arch/hlt.h b/src/arch/x86/include/arch/hlt.h
index cf7176ae90..7b18f55657 100644
--- a/src/arch/x86/include/arch/hlt.h
+++ b/src/arch/x86/include/arch/hlt.h
@@ -20,8 +20,6 @@ static void hlt(void)
__builtin_hlt();
}
#else
-#include <compiler.h>
-
static __always_inline void hlt(void)
{
asm("hlt");
diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h
index 64b5f120e0..1b0fdb0515 100644
--- a/src/arch/x86/include/arch/io.h
+++ b/src/arch/x86/include/arch/io.h
@@ -14,7 +14,6 @@
#ifndef _ASM_IO_H
#define _ASM_IO_H
-#include <compiler.h>
#include <endian.h>
#include <stdint.h>
#include <rules.h>
diff --git a/src/arch/x86/include/arch/pci_io_cfg.h b/src/arch/x86/include/arch/pci_io_cfg.h
index 15d1a132cf..ddc62ed393 100644
--- a/src/arch/x86/include/arch/pci_io_cfg.h
+++ b/src/arch/x86/include/arch/pci_io_cfg.h
@@ -14,7 +14,6 @@
#ifndef _PCI_IO_CFG_H
#define _PCI_IO_CFG_H
-#include <compiler.h>
#include <arch/io.h>
static __always_inline
diff --git a/src/arch/x86/include/arch/pci_mmio_cfg.h b/src/arch/x86/include/arch/pci_mmio_cfg.h
index a5ca574466..c660ed5332 100644
--- a/src/arch/x86/include/arch/pci_mmio_cfg.h
+++ b/src/arch/x86/include/arch/pci_mmio_cfg.h
@@ -17,7 +17,6 @@
#define _PCI_MMIO_CFG_H
#include <arch/io.h>
-#include <compiler.h>
#define DEFAULT_PCIEXBAR CONFIG_MMCONF_BASE_ADDRESS
diff --git a/src/arch/x86/include/arch/pirq_routing.h b/src/arch/x86/include/arch/pirq_routing.h
index 01179121ec..b416ec1422 100644
--- a/src/arch/x86/include/arch/pirq_routing.h
+++ b/src/arch/x86/include/arch/pirq_routing.h
@@ -28,7 +28,6 @@
#define MAX_INTX_ENTRIES 4
#include <stdint.h>
-#include <compiler.h>
#define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24))
#define PIRQ_VERSION 0x0100
diff --git a/src/arch/x86/include/arch/registers.h b/src/arch/x86/include/arch/registers.h
index 9a618f4870..08f83ac091 100644
--- a/src/arch/x86/include/arch/registers.h
+++ b/src/arch/x86/include/arch/registers.h
@@ -16,8 +16,6 @@
#ifndef __ARCH_REGISTERS_H
#define __ARCH_REGISTERS_H
-#include <compiler.h>
-
#if !defined(__ASSEMBLER__)
#define DOWNTO8(A) \
union { \
diff --git a/src/arch/x86/include/arch/smp/atomic.h b/src/arch/x86/include/arch/smp/atomic.h
index b12da12e54..75650c7f98 100644
--- a/src/arch/x86/include/arch/smp/atomic.h
+++ b/src/arch/x86/include/arch/smp/atomic.h
@@ -14,8 +14,6 @@
#ifndef ARCH_SMP_ATOMIC_H
#define ARCH_SMP_ATOMIC_H
-#include <compiler.h>
-
/*
* Make sure gcc doesn't try to be clever and move things around
* on us. We need to use _exactly_ the address the user gave us,
diff --git a/src/arch/x86/include/arch/smp/mpspec.h b/src/arch/x86/include/arch/smp/mpspec.h
index 8b3e8bb8f9..1e7300fea6 100644
--- a/src/arch/x86/include/arch/smp/mpspec.h
+++ b/src/arch/x86/include/arch/smp/mpspec.h
@@ -16,7 +16,6 @@
#ifndef __ASM_MPSPEC_H
#define __ASM_MPSPEC_H
-#include <compiler.h>
#include <device/device.h>
#include <cpu/x86/lapic_def.h>
diff --git a/src/arch/x86/include/arch/smp/spinlock.h b/src/arch/x86/include/arch/smp/spinlock.h
index 212cd8cd64..183d726d19 100644
--- a/src/arch/x86/include/arch/smp/spinlock.h
+++ b/src/arch/x86/include/arch/smp/spinlock.h
@@ -14,8 +14,6 @@
#ifndef ARCH_SMP_SPINLOCK_H
#define ARCH_SMP_SPINLOCK_H
-#include <compiler.h>
-
#if !defined(__PRE_RAM__) \
|| IS_ENABLED(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK) \
|| IS_ENABLED(CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK) \
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c
index 8280171ac6..8dd902e1d7 100644
--- a/src/arch/x86/mpspec.c
+++ b/src/arch/x86/mpspec.c
@@ -17,7 +17,6 @@
#include <device/path.h>
#include <device/pci_ids.h>
#include <cpu/cpu.h>
-#include <compiler.h>
#include <arch/smp/mpspec.h>
#include <string.h>
#include <arch/cpu.h>
diff --git a/src/arch/x86/pirq_routing.c b/src/arch/x86/pirq_routing.c
index 96117fc43f..7aa50d7542 100644
--- a/src/arch/x86/pirq_routing.c
+++ b/src/arch/x86/pirq_routing.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
#include <console/console.h>
-#include <compiler.h>
#include <arch/pirq_routing.h>
#include <string.h>
#include <device/pci.h>
diff --git a/src/arch/x86/postcar.c b/src/arch/x86/postcar.c
index 6497b73e10..295276bf8d 100644
--- a/src/arch/x86/postcar.c
+++ b/src/arch/x86/postcar.c
@@ -15,7 +15,6 @@
#include <arch/cpu.h>
#include <cbmem.h>
-#include <compiler.h>
#include <console/console.h>
#include <main_decl.h>
#include <program_loading.h>
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index fc3a0a7f6b..c0545ce779 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <string.h>
#include <smbios.h>
-#include <compiler.h>
#include <console/console.h>
#include <version.h>
#include <device/device.h>
diff --git a/src/arch/x86/timestamp.c b/src/arch/x86/timestamp.c
index b0aac9c1ab..928d7d7402 100644
--- a/src/arch/x86/timestamp.c
+++ b/src/arch/x86/timestamp.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <compiler.h>
#include <cpu/x86/tsc.h>
#include <timestamp.h>