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>

Makefile.inc

@@ -378,6 +378,7 @@ CPPFLAGS_common += -Isrc/device/oprom/include
 VBOOT_SOURCE ?= 3rdparty/vboot
 CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/include
 CPPFLAGS_common += -include $(src)/include/kconfig.h
+CPPFLAGS_common += -include $(src)/commonlib/include/commonlib/compiler.h
 CPPFLAGS_common += -I3rdparty
 CPPFLAGS_common += -D__BUILD_DIR__=\"$(obj)\"
 

src/arch/arm/include/arch/hlt.h

@@ -14,8 +14,6 @@
 #ifndef ARCH_HLT_H
 #define ARCH_HLT_H
 
-#include <compiler.h>
-
 static __always_inline void hlt(void)
 {
 	for (;;) ;

src/arch/arm/stages.c

@@ -26,7 +26,6 @@
 
 #include <arch/stages.h>
 #include <arch/cache.h>
-#include <compiler.h>
 
 /**
  * generic stage entry point. override this if board specific code is needed.

src/arch/arm64/arm_tf.c

@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <compiler.h>
 #include <program_loading.h>
 
 /*

src/arch/arm64/boot.c

@@ -19,7 +19,6 @@
 #include <arch/transition.h>
 #include <arm_tf.h>
 #include <cbmem.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <program_loading.h>
 #include <rules.h>

src/arch/arm64/include/arch/hlt.h

@@ -14,8 +14,6 @@
 #ifndef ARCH_HLT_H
 #define ARCH_HLT_H
 
-#include <compiler.h>
-
 static __always_inline void hlt(void)
 {
 	for (;;) ;

src/arch/arm64/transition.c

@@ -18,7 +18,6 @@
 #include <arch/mmu.h>
 #include <arch/transition.h>
 #include <assert.h>
-#include <compiler.h>
 #include <console/console.h>
 
 /* Litte-endian, No XN-forced, Instr cache disabled,

src/arch/mips/include/arch/hlt.h

@@ -16,8 +16,6 @@
 #ifndef __MIPS_ARCH_HLT_H
 #define __MIPS_ARCH_HLT_H
 
-#include <compiler.h>
-
 static inline __always_inline void hlt(void)
 {
 	for (;;)

src/arch/power8/include/arch/hlt.h

@@ -11,8 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
-
 static __always_inline void hlt(void)
 {
 	while (1)

src/arch/riscv/include/arch/hlt.h

@@ -11,8 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
-
 static __always_inline void hlt(void)
 {
 	while (1);

src/arch/riscv/include/arch/io.h

@@ -16,7 +16,6 @@
 
 #include <endian.h>
 #include <stdint.h>
-#include <compiler.h>
 
 static __always_inline uint8_t read8(const volatile void *addr)
 {

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>

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>

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>
 

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)

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>

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>

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>

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");

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>

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

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
 

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

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 { \

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,

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>
 

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)	\

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>

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>

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>

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>

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>
 

src/commonlib/fsp_relocate.c

@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include <console/console.h>
 #include <commonlib/endian.h>
 #include <commonlib/fsp.h>

src/commonlib/include/commonlib/cbfs_serialized.h

@@ -48,7 +48,6 @@
 #define _CBFS_SERIALIZED_H_
 
 #include <stdint.h>
-#include <compiler.h>
 
 /** These are standard values for the known compression
     algorithms that coreboot knows about for stages and

src/commonlib/include/commonlib/compiler.h

@@ -13,20 +13,39 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __COMPILER_H__
+#ifndef _COMMONLIB_COMPILER_H_
-#define __COMPILER_H__
+#define _COMMONLIB_COMPILER_H_
 
+#ifndef __packed
 #if defined(__WIN32) || defined(__WIN64)
 #define __packed __attribute__((gcc_struct, packed))
 #else
 #define __packed __attribute__((packed))
 #endif
+#endif
 
+#ifndef __aligned
 #define __aligned(x) __attribute__((aligned(x)))
+#endif
+
+#ifndef __always_unused
 #define __always_unused __attribute__((unused))
+#endif
+
+#ifndef __must_check
 #define __must_check __attribute__((warn_unused_result))
+#endif
+
+#ifndef __weak
 #define __weak __attribute__((weak))
+#endif
+
+#ifndef __noreturn
 #define __noreturn __attribute__((noreturn))
+#endif
+
+#ifndef __always_inline
 #define __always_inline inline __attribute__((always_inline))
+#endif
 
 #endif

src/commonlib/include/commonlib/fmap_serialized.h

@@ -37,7 +37,6 @@
 #define FLASHMAP_SERIALIZED_H__
 
 #include <stdint.h>
-#include <compiler.h>
 
 #define FMAP_SIGNATURE		"__FMAP__"
 #define FMAP_VER_MAJOR		1	/* this header's FMAP minor version */

src/commonlib/include/commonlib/rmodule-defs.h

@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <compiler.h>
 
 #define RMODULE_MAGIC 0xf8fe
 #define RMODULE_VERSION_1 1

src/commonlib/include/commonlib/tcpa_log_serialized.h

@@ -16,7 +16,6 @@
 #ifndef __TCPA_LOG_SERIALIZED_H__
 #define __TCPA_LOG_SERIALIZED_H__
 
-#include <compiler.h>
 #include <stdint.h>
 
 #define MAX_TCPA_LOG_ENTRIES 50

src/commonlib/include/commonlib/timestamp_serialized.h

@@ -17,7 +17,6 @@
 #define __TIMESTAMP_SERIALIZED_H__
 
 #include <stdint.h>
-#include <compiler.h>
 
 struct timestamp_entry {
 	uint32_t	entry_id;

src/commonlib/lz4_wrapper.c

@@ -34,7 +34,6 @@
 #include <commonlib/helpers.h>
 #include <stdint.h>
 #include <string.h>
-#include <compiler.h>
 
 /* LZ4 comes with its own supposedly portable memory access functions, but they
  * seem to be very inefficient in practice (at least on ARM64). Since coreboot

src/commonlib/storage/sdhci.c

@@ -22,7 +22,6 @@
 #include <commonlib/sd_mmc_ctrlr.h>
 #include <commonlib/sdhci.h>
 #include <commonlib/storage.h>
-#include <compiler.h>
 #include <delay.h>
 #include <endian.h>
 #include <halt.h>

src/console/die.c

@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <halt.h>
 

src/console/post.c

@@ -16,7 +16,6 @@
 
 #include <arch/io.h>
 #include <elog.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <pc80/mc146818rtc.h>

src/cpu/allwinner/a10/clock.h

@@ -23,7 +23,6 @@
 
 #include "memmap.h"
 #include <types.h>
-#include <compiler.h>
 
 /* CPU_AHB_APB0 config values */
 #define CPU_CLK_SRC_MASK		(3 << 16)

src/cpu/allwinner/a10/gpio.h

@@ -19,7 +19,6 @@
 #define __CPU_ALLWINNER_A10_PINMUX_H
 
 #include <types.h>
-#include <compiler.h>
 
 #define GPIO_BASE		 0x01C20800
 

src/cpu/allwinner/a10/timer.h

@@ -23,7 +23,6 @@
 
 #include "memmap.h"
 #include <types.h>
-#include <compiler.h>
 
 /* TMRx_CTRL values */
 #define TIMER_CTRL_MODE_SINGLE		(1 << 7)

src/cpu/allwinner/a10/uart.h

@@ -26,7 +26,6 @@
 #define CPU_ALLWINNER_A10_UART_H
 
 #include <types.h>
-#include <compiler.h>
 
 struct a10_uart {
 	union {

src/cpu/amd/car/disable_cache_as_ram.c

@@ -19,7 +19,6 @@
  * WARNING: this file will be used by both any AP cores and core 0 / node 0
  */
 
-#include <compiler.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/msr.h>
 

src/cpu/amd/family_10h-family_15h/init_cpus.c

@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include "init_cpus.h"
 
 #if IS_ENABLED(CONFIG_HAVE_OPTION_TABLE)

src/cpu/intel/microcode/microcode.c

@@ -24,7 +24,6 @@
 #else
 #include <arch/cbfs.h>
 #endif
-#include <compiler.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/microcode.h>

src/cpu/intel/smm/gen1/smmrelocate.c

@@ -18,7 +18,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <compiler.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <cpu/cpu.h>

src/cpu/ti/am335x/clock.h

@@ -16,7 +16,6 @@
 #define __CPU_TI_AM335X_CLOCK_H__
 
 #include <stdint.h>
-#include <compiler.h>
 
 enum {
 	CM_ST_NO_SLEEP = 0x0,

src/cpu/ti/am335x/gpio.h

@@ -16,7 +16,6 @@
 #define __CPU_TI_AM335X_GPIO_H__
 
 #include <stdint.h>
-#include <compiler.h>
 
 enum {
 	AM335X_GPIO_BITS_PER_BANK = 32

src/cpu/ti/am335x/header.c

@@ -15,7 +15,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <symbols.h>
-#include <compiler.h>
 
 #include "header.h"
 

src/cpu/ti/am335x/header.h

@@ -16,7 +16,6 @@
 #define __CPU_TI_AM335X_HEADER_H
 
 #include <stdint.h>
-#include <compiler.h>
 
 struct configuration_header_toc_item {
 	// Offset from the start address of the TOC to the actual address of

src/cpu/ti/am335x/uart.h

@@ -15,8 +15,6 @@
 #ifndef AM335X_UART_H
 #define AM335X_UART_H
 
-#include <compiler.h>
-
 #define AM335X_UART0_BASE	0x44e09000
 #define AM335X_UART1_BASE	0x48020000
 #define AM335X_UART2_BASE	0x48024000

src/cpu/x86/mp_init.c

@@ -16,7 +16,6 @@
 
 #include <console/console.h>
 #include <stdint.h>
-#include <compiler.h>
 #include <rmodule.h>
 #include <arch/cpu.h>
 #include <cpu/cpu.h>

src/cpu/x86/pae/pgtbl.c

@@ -14,7 +14,6 @@
  */
 
 #include <cbfs.h>
-#include <compiler.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <cpu/cpu.h>

src/cpu/x86/smm/smihandler.c

@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>

src/cpu/x86/smm/smm_module_handler.c

@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <rmodule.h>

src/cpu/x86/smm/smm_module_loader.c

@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include <string.h>
 #include <rmodule.h>
 #include <cpu/x86/smm.h>

src/device/oprom/yabel/device.c

@@ -33,7 +33,6 @@
  *****************************************************************************/
 
 
-#include <compiler.h>
 #include "device.h"
 #include "compat/rtas.h"
 #include <string.h>

src/device/oprom/yabel/device.h

@@ -36,7 +36,6 @@
 #define DEVICE_LIB_H
 
 #include <types.h>
-#include <compiler.h>
 #include <endian.h>
 #include "compat/of.h"
 #include "debug.h"

src/device/oprom/yabel/pmm.h

@@ -35,7 +35,6 @@
 #define _YABEL_PMM_H_
 
 #include <types.h>
-#include <compiler.h>
 
 /* PMM Structure see PMM Spec Version 1.01 Chapter 3.1.1
  * (search web for specspmm101.pdf)

src/device/pci_rom.c

@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <commonlib/endian.h>
-#include <compiler.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>

src/drivers/amd/agesa/romstage.c

@@ -18,7 +18,6 @@
 #include <cbmem.h>
 #include <cpu/amd/car.h>
 #include <cpu/x86/bist.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <halt.h>
 #include <program_loading.h>

src/drivers/amd/agesa/state_machine.c

@@ -21,7 +21,6 @@
 #include <bootstate.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <compiler.h>
 
 #include <northbridge/amd/agesa/state_machine.h>
 #include <northbridge/amd/agesa/agesa_helper.h>

src/drivers/elog/boot_count.c

@@ -18,7 +18,6 @@
 #include <pc80/mc146818rtc.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <compiler.h>
 #include <elog.h>
 
 /*

src/drivers/elog/elog_internal.h

@@ -16,7 +16,6 @@
 #ifndef ELOG_INTERNAL_H_
 #define ELOG_INTERNAL_H_
 
-#include <compiler.h>
 /* ELOG header */
 struct elog_header {
 	u32 magic;

src/drivers/elog/gsmi.c

@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include <arch/io.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <elog.h>

src/drivers/i2c/designware/dw_i2c.h

@@ -16,7 +16,6 @@
 #ifndef __DRIVERS_I2C_DESIGNWARE_I2C_H__
 #define __DRIVERS_I2C_DESIGNWARE_I2C_H__
 
-#include <compiler.h>
 #include <device/device.h>
 #include <device/i2c.h>
 #include <stdint.h>

src/drivers/i2c/tpm/cr50.c

@@ -31,7 +31,6 @@
 
 #include <arch/early_variables.h>
 #include <commonlib/endian.h>
-#include <compiler.h>
 #include <stdint.h>
 #include <string.h>
 #include <types.h>

src/drivers/i2c/tpm/tis_atmel.c

@@ -14,7 +14,6 @@
 
 #include <arch/early_variables.h>
 #include <stdint.h>
-#include <compiler.h>
 #include <string.h>
 #include <assert.h>
 #include <commonlib/endian.h>

src/drivers/intel/fsp1_0/fsp_util.c

@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <bootstate.h>
 #include <cbmem.h>

src/drivers/intel/fsp1_0/fsp_util.h

@@ -16,7 +16,6 @@
 #ifndef FSP_UTIL_H
 #define FSP_UTIL_H
 
-#include <compiler.h>
 #include <chipset_fsp_util.h>
 #include "fsp_values.h"
 

src/drivers/intel/fsp1_1/car.c

@@ -14,7 +14,6 @@
  */
 
 #include <arch/early_variables.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <fsp/car.h>
 #include <fsp/util.h>

src/drivers/intel/fsp1_1/fsp_util.c

@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include <bootstate.h>
 #include <cbmem.h>
 #include <console/console.h>

src/drivers/intel/fsp1_1/raminit.c

@@ -15,7 +15,6 @@
 
 #include <arch/acpi.h>
 #include <cbmem.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <fsp/memmap.h>
 #include <fsp/romstage.h>

src/drivers/intel/fsp1_1/ramstage.c

@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <cbmem.h>
 #include <cbfs.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <fsp/memmap.h>
 #include <fsp/ramstage.h>

src/drivers/intel/fsp1_1/romstage.c

@@ -20,7 +20,6 @@
 #include <arch/cbfs.h>
 #include <arch/early_variables.h>
 #include <assert.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <cbmem.h>
 #include <cpu/intel/microcode.h>

src/drivers/intel/fsp2_0/graphics.c

@@ -10,7 +10,6 @@
  * (at your option) any later version.
  */
 
-#include <compiler.h>
 #include <cbfs.h>
 #include <console/console.h>
 #include <fsp/util.h>

src/drivers/intel/fsp2_0/hob_display.c

@@ -9,7 +9,6 @@
  * (at your option) any later version.
  */
 
-#include <compiler.h>
 #include <console/console.h>
 #include <fsp/util.h>
 

src/drivers/intel/fsp2_0/include/fsp/upd.h

@@ -12,8 +12,6 @@
 #ifndef _FSP2_0_UPD_H_
 #define _FSP2_0_UPD_H_
 
-#include <compiler.h>
-
 struct FSP_UPD_HEADER {
 	///
 	/// UPD Region Signature. This signature will be

src/drivers/intel/fsp2_0/include/fsp/util.h

@@ -13,7 +13,6 @@
 #ifndef _FSP2_0_UTIL_H_
 #define _FSP2_0_UTIL_H_
 
-#include <compiler.h>
 #include <boot/coreboot_tables.h>
 #include <commonlib/region.h>
 #include <arch/cpu.h>

src/drivers/intel/fsp2_0/memory_init.c

@@ -11,7 +11,6 @@
  * (at your option) any later version.
  */
 
-#include <compiler.h>
 #include <security/vboot/antirollback.h>
 #include <arch/io.h>
 #include <arch/cpu.h>

src/drivers/intel/fsp2_0/notify.c

@@ -12,7 +12,6 @@
 
 #include <arch/cpu.h>
 #include <bootstate.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <fsp/util.h>
 #include <soc/intel/common/util.h>

src/drivers/intel/fsp2_0/upd_display.c

@@ -10,7 +10,6 @@
  */
 
 #include <arch/cpu.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <fsp/util.h>
 #include <lib.h>

src/drivers/intel/gma/intel_bios.h

@@ -28,8 +28,6 @@
 #ifndef _I830_BIOS_H_
 #define _I830_BIOS_H_
 
-#include <compiler.h>
-
 struct vbt_header {
 	u8 signature[20];		/**< Always starts with 'VBT$' */
 	u16 version;			/**< decimal */

src/drivers/intel/gma/opregion.h

@@ -19,7 +19,6 @@
 #define _COMMON_GMA_H_
 
 #include <types.h>
-#include <compiler.h>
 #include <commonlib/helpers.h>
 
 /* IGD PCI Configuration register */

src/drivers/intel/mipi_camera/chip.h

@@ -17,7 +17,6 @@
 #define __INTEL_MIPI_CAMERA_CHIP_H__
 
 #include <stdint.h>
-#include <compiler.h>
 
 #define MAX_PWDB_ENTRIES 12
 

src/drivers/intel/wifi/wifi.c

@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include <arch/acpi_device.h>
 #include <arch/acpigen.h>
 #include <console/console.h>

src/drivers/mrc_cache/mrc_cache.c

@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include <string.h>
 #include <boot_device.h>
 #include <bootstate.h>

src/drivers/siemens/nc_fpga/nc_fpga.h

@@ -16,8 +16,6 @@
 #ifndef _SIEMENS_NC_FPGA_H_
 #define _SIEMENS_NC_FPGA_H_
 
-#include <compiler.h>
-
 #define NC_MAGIC_OFFSET			0x020
 #define  NC_FPGA_MAGIC			0x4E433746
 #define NC_CAP1_OFFSET			0x080

src/drivers/spi/spi-generic.c

@@ -15,7 +15,6 @@
  */
 
 #include <assert.h>
-#include <compiler.h>
 #include <spi-generic.h>
 #include <string.h>
 

src/drivers/spi/tpm/tpm.c

@@ -17,7 +17,6 @@
 
 #include <arch/early_variables.h>
 #include <assert.h>
-#include <compiler.h>
 #include <commonlib/endian.h>
 #include <console/console.h>
 #include <delay.h>

src/drivers/usb/ehci.h

@@ -19,8 +19,6 @@
 #ifndef EHCI_H
 #define EHCI_H
 
-#include <compiler.h>
-
 /* EHCI register interface, corresponds to EHCI Revision 0.95 specification */
 
 /* Section 2.2 Host Controller Capability Registers */

src/drivers/usb/usb_ch9.h

@@ -17,8 +17,6 @@
 #ifndef USB_CH9_H
 #define USB_CH9_H
 
-#include <compiler.h>
-
 #define USB_DIR_OUT                     0               /* to device */
 #define USB_DIR_IN                      0x80            /* to host */
 

src/drivers/vpd/vpd_tables.h

@@ -9,7 +9,6 @@
 #ifndef __LIB_VPD_TABLES_H__
 #define __LIB_VPD_TABLES_H__
 
-#include <compiler.h>
 #include <inttypes.h>
 
 #define VPD_ENTRY_MAGIC    "_SM_"

src/ec/google/chromeec/crosec_proto.c

@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <delay.h>
 #include <stdint.h>

src/include/console/console.h

@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <rules.h>
 #include <arch/cpu.h>
-#include <compiler.h>
 #include <console/post_codes.h>
 #include <commonlib/loglevel.h>