diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-10-04 23:42:42 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2018-10-08 16:57:27 +0000 |
| commit | d44221f9c8f3686e040ff9481829315068b321a3 (patch) | |
| tree | 76337bf1cae88feda44e3c63dd7e32e964e8767d | |
| parent | 834543c0c71544b547194b093b8e1da990722762 (diff) | |
| download | coreboot-d44221f9c8f3686e040ff9481829315068b321a3.tar.gz coreboot-d44221f9c8f3686e040ff9481829315068b321a3.tar.bz2 coreboot-d44221f9c8f3686e040ff9481829315068b321a3.zip | |
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>
342 files changed, 33 insertions, 454 deletions
diff --git a/Makefile.inc b/Makefile.inc index 8f589584125b..1e58967cca1a 100644 --- a/Makefile.inc +++ b/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)\" diff --git a/src/arch/arm/include/arch/hlt.h b/src/arch/arm/include/arch/hlt.h index fd2aac9c9f4a..915f4c003afd 100644 --- a/src/arch/arm/include/arch/hlt.h +++ b/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 (;;) ; diff --git a/src/arch/arm/stages.c b/src/arch/arm/stages.c index 1fae88637afd..22ade638aed1 100644 --- a/src/arch/arm/stages.c +++ b/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. diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c index 88416ea27dbf..fcf66cac6196 100644 --- a/src/arch/arm64/arm_tf.c +++ b/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> /* diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c index 95c51d3842b1..2357912eaeee 100644 --- a/src/arch/arm64/boot.c +++ b/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> diff --git a/src/arch/arm64/include/arch/hlt.h b/src/arch/arm64/include/arch/hlt.h index fd2aac9c9f4a..915f4c003afd 100644 --- a/src/arch/arm64/include/arch/hlt.h +++ b/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 (;;) ; diff --git a/src/arch/arm64/transition.c b/src/arch/arm64/transition.c index ee5e57036a32..fb4f4be16256 100644 --- a/src/arch/arm64/transition.c +++ b/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, diff --git a/src/arch/mips/include/arch/hlt.h b/src/arch/mips/include/arch/hlt.h index dd66c440ab5c..703773ba2073 100644 --- a/src/arch/mips/include/arch/hlt.h +++ b/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 (;;) diff --git a/src/arch/power8/include/arch/hlt.h b/src/arch/power8/include/arch/hlt.h index 19c7ecceb8b6..1ba1e35b6754 100644 --- a/src/arch/power8/include/arch/hlt.h +++ b/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) diff --git a/src/arch/riscv/include/arch/hlt.h b/src/arch/riscv/include/arch/hlt.h index 2ea2e01f50f5..a955ebbb0c46 100644 --- a/src/arch/riscv/include/arch/hlt.h +++ b/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); diff --git a/src/arch/riscv/include/arch/io.h b/src/arch/riscv/include/arch/io.h index 6fd0cac88e75..d086d0cdb261 100644 --- a/src/arch/riscv/include/arch/io.h +++ b/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) { diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index d75d8895130b..1b430041f7d2 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 ebf291cdce28..71267f033b69 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 a630ef21184e..de3d39e3b4da 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 52f8f8a5de21..b3d89f49534e 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 201e835e1623..a281c54c1d7a 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 24a1c810729e..83ab858e226c 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 c84adda0d0b2..54be1f40b75d 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 cf7176ae90a8..7b18f5565721 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 64b5f120e0e1..1b0fdb05158e 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 15d1a132cfe6..ddc62ed39336 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 a5ca57446623..c660ed5332a1 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 01179121ec1f..b416ec142218 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 9a618f4870b2..08f83ac091d5 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 b12da12e54ee..75650c7f9862 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 8b3e8bb8f955..1e7300fea684 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 212cd8cd64cc..183d726d195f 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 8280171ac6e6..8dd902e1d73b 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 96117fc43ff2..7aa50d754229 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 6497b73e1045..295276bf8d80 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 fc3a0a7f6b27..c0545ce779a0 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 b0aac9c1ab33..928d7d7402c1 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> diff --git a/src/commonlib/fsp_relocate.c b/src/commonlib/fsp_relocate.c index d96edd2178f6..fe58a29d27bd 100644 --- a/src/commonlib/fsp_relocate.c +++ b/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> diff --git a/src/commonlib/include/commonlib/cbfs_serialized.h b/src/commonlib/include/commonlib/cbfs_serialized.h index e8f027fad325..6e254f6bbe77 100644 --- a/src/commonlib/include/commonlib/cbfs_serialized.h +++ b/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 diff --git a/src/include/compiler.h b/src/commonlib/include/commonlib/compiler.h index 96c2045e4d52..2e0c454fc917 100644 --- a/src/include/compiler.h +++ b/src/commonlib/include/commonlib/compiler.h @@ -13,20 +13,39 @@ * GNU General Public License for more details. */ -#ifndef __COMPILER_H__ -#define __COMPILER_H__ +#ifndef _COMMONLIB_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 diff --git a/src/commonlib/include/commonlib/fmap_serialized.h b/src/commonlib/include/commonlib/fmap_serialized.h index cea231b2c20b..1e837604427f 100644 --- a/src/commonlib/include/commonlib/fmap_serialized.h +++ b/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 */ diff --git a/src/commonlib/include/commonlib/rmodule-defs.h b/src/commonlib/include/commonlib/rmodule-defs.h index 485d6383bfb1..564fcd26afc3 100644 --- a/src/commonlib/include/commonlib/rmodule-defs.h +++ b/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 diff --git a/src/commonlib/include/commonlib/tcpa_log_serialized.h b/src/commonlib/include/commonlib/tcpa_log_serialized.h index 6dfb566fdcf2..1e9ffaab8757 100644 --- a/src/commonlib/include/commonlib/tcpa_log_serialized.h +++ b/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 diff --git a/src/commonlib/include/commonlib/timestamp_serialized.h b/src/commonlib/include/commonlib/timestamp_serialized.h index 304e43fab943..cbf07b5aaca4 100644 --- a/src/commonlib/include/commonlib/timestamp_serialized.h +++ b/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; diff --git a/src/commonlib/lz4_wrapper.c b/src/commonlib/lz4_wrapper.c index 8f516089ca80..474df642c224 100644 --- a/src/commonlib/lz4_wrapper.c +++ b/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 diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c index 158e28b648ae..fd3915f92e9e 100644 --- a/src/commonlib/storage/sdhci.c +++ b/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> diff --git a/src/console/die.c b/src/console/die.c index 59411256bea3..aedf66e3ecd7 100644 --- a/src/console/die.c +++ b/src/console/die.c @@ -15,7 +15,6 @@ */ #include <arch/io.h> -#include <compiler.h> #include <console/console.h> #include <halt.h> diff --git a/src/console/post.c b/src/console/post.c index 969c7c703f5d..323a1910f911 100644 --- a/src/console/post.c +++ b/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> diff --git a/src/cpu/allwinner/a10/clock.h b/src/cpu/allwinner/a10/clock.h index 815a94d13912..110a6f8ec969 100644 --- a/src/cpu/allwinner/a10/clock.h +++ b/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) diff --git a/src/cpu/allwinner/a10/gpio.h b/src/cpu/allwinner/a10/gpio.h index a12680100089..c05122fea60c 100644 --- a/src/cpu/allwinner/a10/gpio.h +++ b/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 diff --git a/src/cpu/allwinner/a10/timer.h b/src/cpu/allwinner/a10/timer.h index e24bf6618b1e..b7658da35d58 100644 --- a/src/cpu/allwinner/a10/timer.h +++ b/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) diff --git a/src/cpu/allwinner/a10/uart.h b/src/cpu/allwinner/a10/uart.h index 92a87e5d110c..a57fc9c3610d 100644 --- a/src/cpu/allwinner/a10/uart.h +++ b/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 { diff --git a/src/cpu/amd/car/disable_cache_as_ram.c b/src/cpu/amd/car/disable_cache_as_ram.c index 36d412045334..a079ce49b147 100644 --- a/src/cpu/amd/car/disable_cache_as_ram.c +++ b/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> diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c index 4911eca38ad3..51cf5104b42f 100644 --- a/src/cpu/amd/family_10h-family_15h/init_cpus.c +++ b/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) diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c index 8cfcb9518276..60342359c25a 100644 --- a/src/cpu/intel/microcode/microcode.c +++ b/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> diff --git a/src/cpu/intel/smm/gen1/smmrelocate.c b/src/cpu/intel/smm/gen1/smmrelocate.c index a5a9de3a1ce9..5d78efd3deae 100644 --- a/src/cpu/intel/smm/gen1/smmrelocate.c +++ b/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> diff --git a/src/cpu/ti/am335x/clock.h b/src/cpu/ti/am335x/clock.h index 564838a0e407..c0b62fcb63c1 100644 --- a/src/cpu/ti/am335x/clock.h +++ b/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, diff --git a/src/cpu/ti/am335x/gpio.h b/src/cpu/ti/am335x/gpio.h index 41fc3d358ef1..c04a00ce0fed 100644 --- a/src/cpu/ti/am335x/gpio.h +++ b/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 diff --git a/src/cpu/ti/am335x/header.c b/src/cpu/ti/am335x/header.c index a260425f485a..847c8b073c96 100644 --- a/src/cpu/ti/am335x/header.c +++ b/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" diff --git a/src/cpu/ti/am335x/header.h b/src/cpu/ti/am335x/header.h index 64d75c75123b..fa5bf7407189 100644 --- a/src/cpu/ti/am335x/header.h +++ b/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 diff --git a/src/cpu/ti/am335x/uart.h b/src/cpu/ti/am335x/uart.h index 7a65076b1097..000a45dbf734 100644 --- a/src/cpu/ti/am335x/uart.h +++ b/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 diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 08cd1f50b33a..aa2a4695a4bc 100644 --- a/src/cpu/x86/mp_init.c +++ b/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> diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c index cf6bf16413cb..795caac3553f 100644 --- a/src/cpu/x86/pae/pgtbl.c +++ b/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> diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c index 99a62896decf..b2fc8b600f28 100644 --- a/src/cpu/x86/smm/smihandler.c +++ b/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> diff --git a/src/cpu/x86/smm/smm_module_handler.c b/src/cpu/x86/smm/smm_module_handler.c index 4fa8a3417294..f9af96520846 100644 --- a/src/cpu/x86/smm/smm_module_handler.c +++ b/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> diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c index 9fd8c498bbc1..6c166454dc5c 100644 --- a/src/cpu/x86/smm/smm_module_loader.c +++ b/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> diff --git a/src/device/oprom/yabel/device.c b/src/device/oprom/yabel/device.c index cd1abfb026e9..438485effbfa 100644 --- a/src/device/oprom/yabel/device.c +++ b/src/device/oprom/yabel/device.c @@ -33,7 +33,6 @@ *****************************************************************************/ -#include <compiler.h> #include "device.h" #include "compat/rtas.h" #include <string.h> diff --git a/src/device/oprom/yabel/device.h b/src/device/oprom/yabel/device.h index 1028ef18335d..f67a38830013 100644 --- a/src/device/oprom/yabel/device.h +++ b/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" diff --git a/src/device/oprom/yabel/pmm.h b/src/device/oprom/yabel/pmm.h index 3c96700e1616..2ecc36e43f62 100644 --- a/src/device/oprom/yabel/pmm.h +++ b/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) diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c index 517fb33baaea..65989d4724dc 100644 --- a/src/device/pci_rom.c +++ b/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> diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c index 90fa0598f996..9b4c50a15e79 100644 --- a/src/drivers/amd/agesa/romstage.c +++ b/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> diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c index 673bf9b9a0c5..e1fdd42b38da 100644 --- a/src/drivers/amd/agesa/state_machine.c +++ b/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> diff --git a/src/drivers/elog/boot_count.c b/src/drivers/elog/boot_count.c index f1ae9d8f6609..c4373ee44ab7 100644 --- a/src/drivers/elog/boot_count.c +++ b/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> /* diff --git a/src/drivers/elog/elog_internal.h b/src/drivers/elog/elog_internal.h index 3ccee90c46ec..afcee5736f23 100644 --- a/src/drivers/elog/elog_internal.h +++ b/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; diff --git a/src/drivers/elog/gsmi.c b/src/drivers/elog/gsmi.c index cced4a129330..5ecb2c59354c 100644 --- a/src/drivers/elog/gsmi.c +++ b/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> diff --git a/src/drivers/i2c/designware/dw_i2c.h b/src/drivers/i2c/designware/dw_i2c.h index ccdb3d235152..17304a18dcc2 100644 --- a/src/drivers/i2c/designware/dw_i2c.h +++ b/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> diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c index 14a84de96f33..b0d3b2904492 100644 --- a/src/drivers/i2c/tpm/cr50.c +++ b/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> diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c index 2bea13565d4f..0c1d86d33dd2 100644 --- a/src/drivers/i2c/tpm/tis_atmel.c +++ b/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> diff --git a/src/drivers/intel/fsp1_0/fsp_util.c b/src/drivers/intel/fsp1_0/fsp_util.c index 5d866bfad83e..a09b1b141ca6 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.c +++ b/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> diff --git a/src/drivers/intel/fsp1_0/fsp_util.h b/src/drivers/intel/fsp1_0/fsp_util.h index 594a25939f5e..d5d0160e499c 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.h +++ b/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" diff --git a/src/drivers/intel/fsp1_1/car.c b/src/drivers/intel/fsp1_1/car.c index 686a4c8c7e02..4016ba1a8e46 100644 --- a/src/drivers/intel/fsp1_1/car.c +++ b/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> diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c index 0116ac274666..2c5e9a769e1a 100644 --- a/src/drivers/intel/fsp1_1/fsp_util.c +++ b/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> diff --git a/src/drivers/intel/fsp1_1/raminit.c b/src/drivers/intel/fsp1_1/raminit.c index e5714ae14018..407a0b6093ee 100644 --- a/src/drivers/intel/fsp1_1/raminit.c +++ b/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> diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c index a4609df5731b..2b857ab0f0b2 100644 --- a/src/drivers/intel/fsp1_1/ramstage.c +++ b/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> diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index 0f13efe42410..b239d8648031 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/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> diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index ae1442ee9d37..e8514974d7ad 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/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> diff --git a/src/drivers/intel/fsp2_0/hob_display.c b/src/drivers/intel/fsp2_0/hob_display.c index 977facbfc694..24a340f344c5 100644 --- a/src/drivers/intel/fsp2_0/hob_display.c +++ b/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> diff --git a/src/drivers/intel/fsp2_0/include/fsp/upd.h b/src/drivers/intel/fsp2_0/include/fsp/upd.h index 580257bd8ecc..15094dfb1075 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/upd.h +++ b/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 diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index e7778ec1824a..231162ed17b9 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/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> diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index accb70ba9182..dc37eaaf1b50 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/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> diff --git a/src/drivers/intel/fsp2_0/notify.c b/src/drivers/intel/fsp2_0/notify.c index 6d6d623be4d0..2907ae25b12d 100644 --- a/src/drivers/intel/fsp2_0/notify.c +++ b/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> diff --git a/src/drivers/intel/fsp2_0/upd_display.c b/src/drivers/intel/fsp2_0/upd_display.c index 415505e1dd78..19803c4f2f9f 100644 --- a/src/drivers/intel/fsp2_0/upd_display.c +++ b/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> diff --git a/src/drivers/intel/gma/intel_bios.h b/src/drivers/intel/gma/intel_bios.h index a6ec487b9be2..8bf44eeb8da9 100644 --- a/src/drivers/intel/gma/intel_bios.h +++ b/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 */ diff --git a/src/drivers/intel/gma/opregion.h b/src/drivers/intel/gma/opregion.h index e6d8648527e2..87ae5a3d765c 100644 --- a/src/drivers/intel/gma/opregion.h +++ b/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 */ diff --git a/src/drivers/intel/mipi_camera/chip.h b/src/drivers/intel/mipi_camera/chip.h index a66b8ac21217..741ae8e1a150 100644 --- a/src/drivers/intel/mipi_camera/chip.h +++ b/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 diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c index cf0f6d89b32a..97c97a2909cd 100644 --- a/src/drivers/intel/wifi/wifi.c +++ b/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> diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c index eec1591ce267..4dd0dbc43492 100644 --- a/src/drivers/mrc_cache/mrc_cache.c +++ b/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> diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.h b/src/drivers/siemens/nc_fpga/nc_fpga.h index fe6636fdd0df..fe5f612a8358 100644 --- a/src/drivers/siemens/nc_fpga/nc_fpga.h +++ b/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 diff --git a/src/drivers/spi/spi-generic.c b/src/drivers/spi/spi-generic.c index f1b11aedf70c..84a42d1c9c19 100644 --- a/src/drivers/spi/spi-generic.c +++ b/src/drivers/spi/spi-generic.c @@ -15,7 +15,6 @@ */ #include <assert.h> -#include <compiler.h> #include <spi-generic.h> #include <string.h> diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c index bdd40a8a3428..aad7610313b5 100644 --- a/src/drivers/spi/tpm/tpm.c +++ b/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> diff --git a/src/drivers/usb/ehci.h b/src/drivers/usb/ehci.h index 33b7854df5cb..e86286a3e3b2 100644 --- a/src/drivers/usb/ehci.h +++ b/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 */ diff --git a/src/drivers/usb/usb_ch9.h b/src/drivers/usb/usb_ch9.h index d7f39dde24a9..79f165461b13 100644 --- a/src/drivers/usb/usb_ch9.h +++ b/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 */ diff --git a/src/drivers/vpd/vpd_tables.h b/src/drivers/vpd/vpd_tables.h index 822ed08b0fc2..0bd215a5a606 100644 --- a/src/drivers/vpd/vpd_tables.h +++ b/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_" diff --git a/src/ec/google/chromeec/crosec_proto.c b/src/ec/google/chromeec/crosec_proto.c index 2529854f2659..20433473ee71 100644 --- a/src/ec/google/chromeec/crosec_proto.c +++ b/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> diff --git a/src/include/console/console.h b/src/include/console/console.h index ff207823989c..a5f730535096 100644 --- a/src/include/console/console.h +++ b/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> diff --git a/src/include/console/spi.h b/src/include/console/spi.h index 42566eb76838..64379f8254bb 100644 --- a/src/include/console/spi.h +++ b/src/include/console/spi.h @@ -18,7 +18,6 @@ #include <rules.h> #include <stdint.h> -#include <compiler.h> void spiconsole_init(void); void spiconsole_tx_byte(unsigned char c); diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h index 9661b636cc16..33b5939e2fab 100644 --- a/src/include/cpu/amd/mtrr.h +++ b/src/include/cpu/amd/mtrr.h @@ -38,7 +38,6 @@ #if !defined(__PRE_RAM__) && !defined(__ASSEMBLER__) -#include <compiler.h> #include <cpu/x86/msr.h> void amd_setup_mtrrs(void); diff --git a/src/include/cpu/x86/cache.h b/src/include/cpu/x86/cache.h index 81d2ae7223e1..c8d26abad457 100644 --- a/src/include/cpu/x86/cache.h +++ b/src/include/cpu/x86/cache.h @@ -16,7 +16,6 @@ #ifndef CPU_X86_CACHE #define CPU_X86_CACHE -#include <compiler.h> #include <cpu/x86/cr.h> #define CR0_CacheDisable (CR0_CD) diff --git a/src/include/cpu/x86/cr.h b/src/include/cpu/x86/cr.h index 229a67d422fd..5d8dcd2ad404 100644 --- a/src/include/cpu/x86/cr.h +++ b/src/include/cpu/x86/cr.h @@ -18,7 +18,6 @@ #if !defined(__ASSEMBLER__) -#include <compiler.h> #include <stdint.h> #include <arch/cpu.h> diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 5ac3c5e2e8a1..be6708fbbc1a 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -1,7 +1,6 @@ #ifndef CPU_X86_LAPIC_H #define CPU_X86_LAPIC_H -#include <compiler.h> #include <cpu/x86/lapic_def.h> #include <cpu/x86/msr.h> #include <halt.h> diff --git a/src/include/cpu/x86/msr.h b/src/include/cpu/x86/msr.h index 290c54a499c3..85e2131e43ac 100644 --- a/src/include/cpu/x86/msr.h +++ b/src/include/cpu/x86/msr.h @@ -1,8 +1,6 @@ #ifndef CPU_X86_MSR_H #define CPU_X86_MSR_H -#include <compiler.h> - /* Intel SDM: Table 2-1 * IA-32 architectural MSR: Extended Feature Enable Register */ diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 9942772f0e46..3cda35b557cc 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -22,7 +22,6 @@ #include <arch/cpu.h> #include <types.h> -#include <compiler.h> #define SMM_DEFAULT_BASE 0x30000 #define SMM_DEFAULT_SIZE 0x10000 diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h index 9e9baa0d6090..5e60e8de2d2b 100644 --- a/src/include/device/pci_ops.h +++ b/src/include/device/pci_ops.h @@ -1,7 +1,6 @@ #ifndef PCI_OPS_H #define PCI_OPS_H -#include <compiler.h> #include <stdint.h> #include <device/device.h> #include <arch/pci_ops.h> diff --git a/src/include/elog.h b/src/include/elog.h index b64953c48bad..8aecf2c29b72 100644 --- a/src/include/elog.h +++ b/src/include/elog.h @@ -16,8 +16,6 @@ #ifndef ELOG_H_ #define ELOG_H_ -#include <compiler.h> - /* SMI command code for GSMI event logging */ #define ELOG_GSMI_APM_CNT 0xEF diff --git a/src/include/halt.h b/src/include/halt.h index e8f1b5197619..117c6c087aeb 100644 --- a/src/include/halt.h +++ b/src/include/halt.h @@ -20,7 +20,6 @@ #ifdef __ROMCC__ #include <lib/halt.c> #else -#include <compiler.h> /** * halt the system reliably */ diff --git a/src/include/memory_info.h b/src/include/memory_info.h index c9554b8a4b43..1b30702c33d1 100644 --- a/src/include/memory_info.h +++ b/src/include/memory_info.h @@ -17,7 +17,6 @@ #define _MEMORY_INFO_H_ #include <stdint.h> -#include <compiler.h> #define DIMM_INFO_SERIAL_SIZE 4 #define DIMM_INFO_PART_NUMBER_SIZE 21 diff --git a/src/include/reset.h b/src/include/reset.h index 48999164bb86..cf9d5744b28f 100644 --- a/src/include/reset.h +++ b/src/include/reset.h @@ -1,8 +1,6 @@ #ifndef RESET_H #define RESET_H -#include <compiler.h> - /* Generic reset functions. Call from code that wants to trigger a reset. */ /* Super-hard reset specific to some Intel SoCs. */ diff --git a/src/include/sar.h b/src/include/sar.h index e1e0fcb2d76f..9da4dd943c2d 100644 --- a/src/include/sar.h +++ b/src/include/sar.h @@ -15,7 +15,6 @@ #ifndef _SAR_H_ #define _SAR_H_ -#include <compiler.h> #include <stdint.h> #define NUM_SAR_LIMITS 4 diff --git a/src/include/smbios.h b/src/include/smbios.h index 631a1a59be1f..574b92469f88 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -19,7 +19,6 @@ #define SMBIOS_H #include <types.h> -#include <compiler.h> unsigned long smbios_write_tables(unsigned long start); int smbios_add_string(u8 *start, const char *str); diff --git a/src/include/vbe.h b/src/include/vbe.h index ceceff29fb8f..2c40d0507ee5 100644 --- a/src/include/vbe.h +++ b/src/include/vbe.h @@ -13,7 +13,6 @@ #ifndef VBE_H #define VBE_H -#include <compiler.h> #include <boot/coreboot_tables.h> // these structs are for input from and output to OF typedef struct { diff --git a/src/lib/boot_device.c b/src/lib/boot_device.c index c5afce7161a5..efbbedb23e87 100644 --- a/src/lib/boot_device.c +++ b/src/lib/boot_device.c @@ -14,7 +14,6 @@ */ #include <boot_device.h> -#include <compiler.h> void __weak boot_device_init(void) { diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c index d74bebfe8324..f2ada522eb52 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -16,7 +16,6 @@ #include <arch/exception.h> #include <bootblock_common.h> -#include <compiler.h> #include <console/console.h> #include <delay.h> #include <pc80/mc146818rtc.h> diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index ca1fc8477edc..9ea7df6ed2c3 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -20,7 +20,6 @@ #include <boot_device.h> #include <cbfs.h> #include <commonlib/compression.h> -#include <compiler.h> #include <endian.h> #include <lib.h> #include <symbols.h> diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c index 2451fca8c718..fd2b46851ae4 100644 --- a/src/lib/cbmem_common.c +++ b/src/lib/cbmem_common.c @@ -14,7 +14,6 @@ */ #include <console/console.h> #include <cbmem.h> -#include <compiler.h> #include <bootstate.h> #include <rules.h> #include <symbols.h> diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index d9716700bb7d..709752bb2333 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <console/cbmem_console.h> #include <console/uart.h> diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index 62b3aaa82b0f..c2ae0949ed15 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -16,7 +16,6 @@ */ #include <arch/cbconfig.h> -#include <compiler.h> #include <console/console.h> #include <console/uart.h> #include <ip_checksum.h> diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c index a079910262b1..e4a128e291c1 100644 --- a/src/lib/fallback_boot.c +++ b/src/lib/fallback_boot.c @@ -1,5 +1,4 @@ #include <fallback.h> -#include <compiler.h> #include <watchdog.h> /* Implement platform specific override. */ diff --git a/src/lib/gpio.c b/src/lib/gpio.c index 4cc039a7da16..ab473cb229c3 100644 --- a/src/lib/gpio.c +++ b/src/lib/gpio.c @@ -15,7 +15,6 @@ #include <assert.h> #include <base3.h> -#include <compiler.h> #include <console/console.h> #include <delay.h> #include <gpio.h> diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index 6fd55d775850..a26d6788b503 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -21,7 +21,6 @@ #include <adainit.h> #include <arch/exception.h> #include <bootstate.h> -#include <compiler.h> #include <console/console.h> #include <console/post_codes.h> #include <cbmem.h> diff --git a/src/lib/imd.c b/src/lib/imd.c index d17cc815ce75..17ec2d9a48de 100644 --- a/src/lib/imd.c +++ b/src/lib/imd.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <assert.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index 83d5c1fd1766..a7a513f05cd8 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -15,7 +15,6 @@ #include <bootstate.h> #include <bootmem.h> -#include <compiler.h> #include <console/console.h> #include <cbmem.h> #include <imd.h> diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 1c192d1f8b64..e3ddce0a5c5e 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -17,7 +17,6 @@ #include <stdlib.h> #include <cbfs.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <fallback.h> #include <halt.h> diff --git a/src/lib/prog_ops.c b/src/lib/prog_ops.c index 5e670d34c07e..2641ac6d05e3 100644 --- a/src/lib/prog_ops.c +++ b/src/lib/prog_ops.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <program_loading.h> /* For each segment of a program loaded this function is called*/ diff --git a/src/lib/reset.c b/src/lib/reset.c index d5676e5cd436..d8284210c47f 100644 --- a/src/lib/reset.c +++ b/src/lib/reset.c @@ -14,7 +14,6 @@ */ #include <arch/cache.h> -#include <compiler.h> #include <console/console.h> #include <halt.h> #include <reset.h> diff --git a/src/lib/timer.c b/src/lib/timer.c index 2cb76ddfca7e..19b423a39870 100644 --- a/src/lib/timer.c +++ b/src/lib/timer.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <timer.h> #include <delay.h> #include <thread.h> diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index 120934d379d0..105b6961ff60 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -17,7 +17,6 @@ #include <assert.h> #include <stddef.h> #include <stdint.h> -#include <compiler.h> #include <console/console.h> #include <cbmem.h> #include <symbols.h> diff --git a/src/lib/wrdd.c b/src/lib/wrdd.c index a8390cf732c8..53c3fbbeeeef 100644 --- a/src/lib/wrdd.c +++ b/src/lib/wrdd.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <wrdd.h> uint16_t __weak wifi_regulatory_domain(void) diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c index 7e3337460df2..f6a3de7d43a7 100644 --- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c +++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c @@ -11,7 +11,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <string.h> #include <swab.h> #include <smbios.h> diff --git a/src/mainboard/google/cyan/romstage.c b/src/mainboard/google/cyan/romstage.c index e56e3d2e1a83..ef0f489d0dab 100644 --- a/src/mainboard/google/cyan/romstage.c +++ b/src/mainboard/google/cyan/romstage.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <soc/romstage.h> #include <baseboard/variants.h> #include <chip.h> diff --git a/src/mainboard/google/cyan/spd/spd.c b/src/mainboard/google/cyan/spd/spd.c index 106faf4c9ca8..7682677d6906 100644 --- a/src/mainboard/google/cyan/spd/spd.c +++ b/src/mainboard/google/cyan/spd/spd.c @@ -16,7 +16,6 @@ #include <cbfs.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <gpio.h> #include <lib.h> diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index 2540bcd47d12..bfd1f2f649c4 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -14,7 +14,6 @@ */ #include <string.h> -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <arch/acpi.h> diff --git a/src/mainboard/google/kahlee/romstage.c b/src/mainboard/google/kahlee/romstage.c index 50e9931a7373..5ec5c2502901 100644 --- a/src/mainboard/google/kahlee/romstage.c +++ b/src/mainboard/google/kahlee/romstage.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <amdblocks/dimm_spd.h> #include <baseboard/variants.h> #include <soc/romstage.h> diff --git a/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c b/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c index 6d34d4a51800..e9cf5c843ad5 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c +++ b/src/mainboard/google/kahlee/variants/baseboard/OemCustomize.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <amdblocks/agesawrapper.h> #include <variant/gpio.h> #include <boardid.h> diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c index 95064bccdfc8..6095a08af08e 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c +++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <baseboard/variants.h> #include <soc/gpio.h> #include <soc/southbridge.h> diff --git a/src/mainboard/google/kahlee/variants/baseboard/memory.c b/src/mainboard/google/kahlee/variants/baseboard/memory.c index 280140ba4db5..67402fb585bd 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/memory.c +++ b/src/mainboard/google/kahlee/variants/baseboard/memory.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <gpio.h> /* src/include/gpio.h */ #include <spd_bin.h> diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c index 6effa7c0803e..fceb95df70a3 100644 --- a/src/mainboard/google/octopus/mainboard.c +++ b/src/mainboard/google/octopus/mainboard.c @@ -16,7 +16,6 @@ #include <arch/acpi.h> #include <baseboard/variants.h> #include <boardid.h> -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <device/pci_def.h> diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c index 4719a095cbac..82d3f7cd1ebf 100644 --- a/src/mainboard/google/octopus/variants/baseboard/gpio.c +++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c @@ -17,7 +17,6 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <compiler.h> /* * Pad configuration in ramstage. The order largely follows the 'GPIO Muxing' diff --git a/src/mainboard/google/octopus/variants/baseboard/memory.c b/src/mainboard/google/octopus/variants/baseboard/memory.c index b7a3fc6076ae..d81d31f9803f 100644 --- a/src/mainboard/google/octopus/variants/baseboard/memory.c +++ b/src/mainboard/google/octopus/variants/baseboard/memory.c @@ -15,7 +15,6 @@ #include <baseboard/variants.h> #include <boardid.h> -#include <compiler.h> #include <gpio.h> #include <soc/meminit.h> #include <variant/gpio.h> diff --git a/src/mainboard/google/octopus/variants/baseboard/nhlt.c b/src/mainboard/google/octopus/variants/baseboard/nhlt.c index b71aadf9d03e..b73bbc945616 100644 --- a/src/mainboard/google/octopus/variants/baseboard/nhlt.c +++ b/src/mainboard/google/octopus/variants/baseboard/nhlt.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <nhlt.h> #include <soc/nhlt.h> diff --git a/src/mainboard/google/poppy/ramstage.c b/src/mainboard/google/poppy/ramstage.c index ea15aea98836..e39afecb9cc4 100644 --- a/src/mainboard/google/poppy/ramstage.c +++ b/src/mainboard/google/poppy/ramstage.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <baseboard/variants.h> #include <soc/ramstage.h> diff --git a/src/mainboard/google/poppy/variants/baseboard/gpio.c b/src/mainboard/google/poppy/variants/baseboard/gpio.c index c1b8e4ce55ea..c731b52c6e92 100644 --- a/src/mainboard/google/poppy/variants/baseboard/gpio.c +++ b/src/mainboard/google/poppy/variants/baseboard/gpio.c @@ -16,7 +16,6 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <compiler.h> /* Pad configuration in ramstage */ /* Leave eSPI pins untouched from default settings */ diff --git a/src/mainboard/google/poppy/variants/baseboard/memory.c b/src/mainboard/google/poppy/variants/baseboard/memory.c index 95f2b9567cc7..59a2d6cbd011 100644 --- a/src/mainboard/google/poppy/variants/baseboard/memory.c +++ b/src/mainboard/google/poppy/variants/baseboard/memory.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <gpio.h> #include <variant/gpio.h> diff --git a/src/mainboard/google/poppy/variants/baseboard/nhlt.c b/src/mainboard/google/poppy/variants/baseboard/nhlt.c index 927cb242da5f..1014cfb5e9cc 100644 --- a/src/mainboard/google/poppy/variants/baseboard/nhlt.c +++ b/src/mainboard/google/poppy/variants/baseboard/nhlt.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <nhlt.h> #include <soc/nhlt.h> diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 2052ae0fbde9..28fa327ab78b 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -19,7 +19,6 @@ #include <cbfs.h> #include <chip.h> #include <commonlib/cbfs_serialized.h> -#include <compiler.h> #include <device/device.h> #include <drivers/intel/gma/opregion.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c index 6db9ac69ecfa..05af84a03e87 100644 --- a/src/mainboard/google/reef/mainboard.c +++ b/src/mainboard/google/reef/mainboard.c @@ -16,7 +16,6 @@ #include <arch/acpi.h> #include <baseboard/variants.h> #include <boardid.h> -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <ec/ec.h> diff --git a/src/mainboard/google/reef/variants/baseboard/gpio.c b/src/mainboard/google/reef/variants/baseboard/gpio.c index 8df587367246..054edaa7fb97 100644 --- a/src/mainboard/google/reef/variants/baseboard/gpio.c +++ b/src/mainboard/google/reef/variants/baseboard/gpio.c @@ -16,7 +16,6 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <compiler.h> /* * Pad configuration in ramstage. The order largely follows the 'GPIO Muxing' diff --git a/src/mainboard/google/reef/variants/baseboard/memory.c b/src/mainboard/google/reef/variants/baseboard/memory.c index 2ee3fb4dd82b..a0aad9ecd8b8 100644 --- a/src/mainboard/google/reef/variants/baseboard/memory.c +++ b/src/mainboard/google/reef/variants/baseboard/memory.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <gpio.h> #include <soc/meminit.h> #include <variant/gpio.h> diff --git a/src/mainboard/google/reef/variants/baseboard/nhlt.c b/src/mainboard/google/reef/variants/baseboard/nhlt.c index 188766954e4c..8e42b930b19e 100644 --- a/src/mainboard/google/reef/variants/baseboard/nhlt.c +++ b/src/mainboard/google/reef/variants/baseboard/nhlt.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <nhlt.h> #include <soc/nhlt.h> diff --git a/src/mainboard/google/zoombini/memory.c b/src/mainboard/google/zoombini/memory.c index 802467c44b23..60829b10a507 100644 --- a/src/mainboard/google/zoombini/memory.c +++ b/src/mainboard/google/zoombini/memory.c @@ -15,7 +15,6 @@ #include <baseboard/variants.h> #include <baseboard/gpio.h> -#include <compiler.h> #include <gpio.h> #include <soc/cnl_memcfg_init.h> diff --git a/src/mainboard/google/zoombini/variants/baseboard/gpio.c b/src/mainboard/google/zoombini/variants/baseboard/gpio.c index f8c84b44e129..54474053adee 100644 --- a/src/mainboard/google/zoombini/variants/baseboard/gpio.c +++ b/src/mainboard/google/zoombini/variants/baseboard/gpio.c @@ -15,7 +15,6 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> -#include <compiler.h> /* Pad configuration in ramstage */ static const struct pad_config gpio_table[] = { diff --git a/src/mainboard/google/zoombini/variants/baseboard/nhlt.c b/src/mainboard/google/zoombini/variants/baseboard/nhlt.c index ffaa6e5c96bd..84c1ec5ddfba 100644 --- a/src/mainboard/google/zoombini/variants/baseboard/nhlt.c +++ b/src/mainboard/google/zoombini/variants/baseboard/nhlt.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <nhlt.h> #include <soc/nhlt.h> diff --git a/src/mainboard/intel/cannonlake_rvp/variants/baseboard/gpio.c b/src/mainboard/intel/cannonlake_rvp/variants/baseboard/gpio.c index fa9d0e941992..a1354da7e061 100644 --- a/src/mainboard/intel/cannonlake_rvp/variants/baseboard/gpio.c +++ b/src/mainboard/intel/cannonlake_rvp/variants/baseboard/gpio.c @@ -16,7 +16,6 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <compiler.h> /* Pad configuration in ramstage*/ static const struct pad_config gpio_table[] = { diff --git a/src/mainboard/intel/cannonlake_rvp/variants/baseboard/nhlt.c b/src/mainboard/intel/cannonlake_rvp/variants/baseboard/nhlt.c index 6f3629e599ce..f3be0e84356c 100644 --- a/src/mainboard/intel/cannonlake_rvp/variants/baseboard/nhlt.c +++ b/src/mainboard/intel/cannonlake_rvp/variants/baseboard/nhlt.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <nhlt.h> #include <soc/nhlt.h> diff --git a/src/mainboard/intel/coffeelake_rvp/memory.c b/src/mainboard/intel/coffeelake_rvp/memory.c index 7058be41306a..a13000cc13d3 100644 --- a/src/mainboard/intel/coffeelake_rvp/memory.c +++ b/src/mainboard/intel/coffeelake_rvp/memory.c @@ -16,7 +16,6 @@ #include <baseboard/variants.h> #include <baseboard/gpio.h> -#include <compiler.h> #include <gpio.h> #include <soc/cnl_memcfg_init.h> diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/nhlt.c b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/nhlt.c index 4d53ecade281..161cc5f55f50 100644 --- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/nhlt.c +++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/nhlt.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <nhlt.h> #include <soc/nhlt.h> diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c index 8242754a49c4..3e5e1bafcd3f 100644 --- a/src/mainboard/intel/galileo/vboot.c +++ b/src/mainboard/intel/galileo/vboot.c @@ -14,7 +14,6 @@ #include <assert.h> #include <bootmode.h> -#include <compiler.h> #include <console/console.h> #include <delay.h> #include <device/i2c_simple.h> diff --git a/src/mainboard/intel/glkrvp/chromeos.c b/src/mainboard/intel/glkrvp/chromeos.c index 76c83e1151e3..1da0d2943120 100644 --- a/src/mainboard/intel/glkrvp/chromeos.c +++ b/src/mainboard/intel/glkrvp/chromeos.c @@ -15,7 +15,6 @@ #include <baseboard/variants.h> #include <boot/coreboot_tables.h> -#include <compiler.h> #include <ec/google/chromeec/ec.h> #include <gpio.h> #include <vendorcode/google/chromeos/chromeos.h> diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c b/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c index f6f31bbcd133..8df1dc4c600f 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c +++ b/src/mainboard/intel/glkrvp/variants/baseboard/boardid.c @@ -15,7 +15,6 @@ #include <baseboard/variants.h> #include <boardid.h> -#include <compiler.h> #include <ec/google/chromeec/ec.h> int variant_board_id(void) diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c index a27047e82dde..946204321a46 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c +++ b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c @@ -16,7 +16,6 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <compiler.h> /* * Pad configuration in ramstage. The order largely follows the 'GPIO Muxing' diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/memory.c b/src/mainboard/intel/glkrvp/variants/baseboard/memory.c index 56fac2a06807..1173ee474573 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/memory.c +++ b/src/mainboard/intel/glkrvp/variants/baseboard/memory.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <gpio.h> #include <soc/meminit.h> #include <variant/gpio.h> diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c b/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c index 51da3addb573..5433bd571c0e 100644 --- a/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c +++ b/src/mainboard/intel/glkrvp/variants/baseboard/nhlt.c @@ -14,7 +14,6 @@ */ #include <baseboard/variants.h> -#include <compiler.h> #include <console/console.h> #include <nhlt.h> #include <soc/nhlt.h> diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c index 1d37d682b230..4305a24567e1 100644 --- a/src/mainboard/siemens/mc_apl1/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/mainboard.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/mainboard/siemens/mc_apl1/variants/baseboard/gpio.c b/src/mainboard/siemens/mc_apl1/variants/baseboard/gpio.c index c4dcc7600561..5ca91efece49 100644 --- a/src/mainboard/siemens/mc_apl1/variants/baseboard/gpio.c +++ b/src/mainboard/siemens/mc_apl1/variants/baseboard/gpio.c @@ -15,7 +15,6 @@ */ #include <commonlib/helpers.h> -#include <compiler.h> #include <baseboard/variants.h> /* diff --git a/src/mainboard/siemens/mc_apl1/variants/baseboard/memory.c b/src/mainboard/siemens/mc_apl1/variants/baseboard/memory.c index 13b7ab8cd338..51bf40e2450d 100644 --- a/src/mainboard/siemens/mc_apl1/variants/baseboard/memory.c +++ b/src/mainboard/siemens/mc_apl1/variants/baseboard/memory.c @@ -16,7 +16,6 @@ #include <baseboard/variants.h> #include <commonlib/helpers.h> -#include <compiler.h> #include <soc/meminit.h> const struct lpddr4_swizzle_cfg baseboard_lpddr4_swizzle = { diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/include/variant/ptn3460.h b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/include/variant/ptn3460.h index 90b509c32892..6ae3e2f75f08 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/include/variant/ptn3460.h +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/include/variant/ptn3460.h @@ -17,7 +17,6 @@ #define PTN3460_H_ #include <stdint.h> -#include <compiler.h> #define PTN_SLAVE_ADR 0x20 #define PTN_I2C_CONTROLLER 0 diff --git a/src/mainboard/siemens/mc_tcu3/ptn3460.h b/src/mainboard/siemens/mc_tcu3/ptn3460.h index 5988c9392277..97bcb41941a2 100644 --- a/src/mainboard/siemens/mc_tcu3/ptn3460.h +++ b/src/mainboard/siemens/mc_tcu3/ptn3460.h @@ -16,7 +16,6 @@ #ifndef PTN3460_H_ #define PTN3460_H_ -#include <compiler.h> #include <delay.h> #include "lcd_panel.h" diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h index 5102b0bb3086..f16ef8325b85 100644 --- a/src/northbridge/amd/amdfam10/amdfam10.h +++ b/src/northbridge/amd/amdfam10/amdfam10.h @@ -18,7 +18,6 @@ #define AMDFAM10_H #include <inttypes.h> -#include <compiler.h> #include <arch/io.h> #include <device/device.h> #include "early_ht.h" diff --git a/src/northbridge/amd/amdmct/mct/mct_d.h b/src/northbridge/amd/amdmct/mct/mct_d.h index 6a69cfae8ca1..5d31d4442805 100644 --- a/src/northbridge/amd/amdmct/mct/mct_d.h +++ b/src/northbridge/amd/amdmct/mct/mct_d.h @@ -23,7 +23,6 @@ #define DQS_TRAIN_DEBUG 0 #include <inttypes.h> -#include <compiler.h> #include "mct_d_gcc.h" #include <console/console.h> #include <northbridge/amd/amdfam10/debug.h> diff --git a/src/northbridge/amd/lx/raminit.c b/src/northbridge/amd/lx/raminit.c index 55dcefde62c5..8de85a346ee3 100644 --- a/src/northbridge/amd/lx/raminit.c +++ b/src/northbridge/amd/lx/raminit.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <cpu/x86/msr.h> #include <cpu/amd/lxdef.h> diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c index d083883eb3d1..3021b813581d 100644 --- a/src/northbridge/amd/pi/agesawrapper.c +++ b/src/northbridge/amd/pi/agesawrapper.c @@ -16,7 +16,6 @@ #include <AGESA.h> #include <cbfs.h> #include <cbmem.h> -#include <compiler.h> #include <delay.h> #include <cpu/x86/mtrr.h> #include <FchPlatform.h> diff --git a/src/northbridge/intel/e7505/raminit.c b/src/northbridge/intel/e7505/raminit.c index 4919e65ae51a..5dcc1faf8556 100644 --- a/src/northbridge/intel/e7505/raminit.c +++ b/src/northbridge/intel/e7505/raminit.c @@ -24,7 +24,6 @@ * Steven James 02/06/2003 */ -#include <compiler.h> #include <stdint.h> #include <device/pci_def.h> #include <arch/io.h> diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h index d8868a10162c..3099a59024c0 100644 --- a/src/northbridge/intel/haswell/haswell.h +++ b/src/northbridge/intel/haswell/haswell.h @@ -202,7 +202,6 @@ #define DMIDRCCFG 0xeb4 /* 32bit */ #ifndef __ASSEMBLER__ -#include <compiler.h> static inline void barrier(void) { asm("" ::: "memory"); } struct ied_header { diff --git a/src/northbridge/intel/haswell/pei_data.h b/src/northbridge/intel/haswell/pei_data.h index f4023e0a6b76..319b9e76f055 100644 --- a/src/northbridge/intel/haswell/pei_data.h +++ b/src/northbridge/intel/haswell/pei_data.h @@ -30,8 +30,6 @@ #ifndef PEI_DATA_H #define PEI_DATA_H -#include <compiler.h> - typedef void (*tx_byte_func)(unsigned char byte); #define PEI_VERSION 15 diff --git a/src/northbridge/intel/i945/raminit.h b/src/northbridge/intel/i945/raminit.h index 7d8555774e43..98bdc02afd02 100644 --- a/src/northbridge/intel/i945/raminit.h +++ b/src/northbridge/intel/i945/raminit.h @@ -16,8 +16,6 @@ #ifndef RAMINIT_H #define RAMINIT_H -#include <compiler.h> - #define DIMM_SOCKETS 2 #define DIMM_TCO_BASE 0x30 diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c index 490fd09003ac..33f9c4869e23 100644 --- a/src/northbridge/intel/nehalem/raminit.c +++ b/src/northbridge/intel/nehalem/raminit.c @@ -15,7 +15,6 @@ */ #include <stdlib.h> -#include <compiler.h> #include <console/console.h> #include <string.h> #include <arch/io.h> diff --git a/src/northbridge/intel/sandybridge/pei_data.h b/src/northbridge/intel/sandybridge/pei_data.h index 41fc33fd9a55..00534ca9a7e7 100644 --- a/src/northbridge/intel/sandybridge/pei_data.h +++ b/src/northbridge/intel/sandybridge/pei_data.h @@ -30,8 +30,6 @@ #ifndef PEI_DATA_H #define PEI_DATA_H -#include <compiler.h> - typedef struct { uint16_t mode; // 0: Disable, 1: Enable, 2: Auto, 3: Smart Auto uint16_t hs_port_switch_mask; // 4 bit mask, 1: switchable, 0: not switchable diff --git a/src/northbridge/intel/sandybridge/raminit.h b/src/northbridge/intel/sandybridge/raminit.h index 66a94f48d837..4bc9de610ea3 100644 --- a/src/northbridge/intel/sandybridge/raminit.h +++ b/src/northbridge/intel/sandybridge/raminit.h @@ -16,7 +16,6 @@ #ifndef RAMINIT_H #define RAMINIT_H -#include <compiler.h> #include "pei_data.h" struct sys_info { diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c index 39b540ca16ac..0c3751f57e49 100644 --- a/src/northbridge/intel/sandybridge/raminit_mrc.c +++ b/src/northbridge/intel/sandybridge/raminit_mrc.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <console/usb.h> #include <bootmode.h> diff --git a/src/security/tpm/tss/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h index 11fb71484c08..e902f3c98540 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_structures.h +++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h @@ -12,7 +12,6 @@ * constants and structures needed for functions used in coreboot. */ #include <stdint.h> -#include <compiler.h> #include <types.h> #include "../common/tss_common.h" diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 2b4e7d4c6423..781aa5ebd03b 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -91,10 +91,12 @@ endif endif # CONFIG_VBOOT_SEPARATE_VERSTAGE VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a -VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%, $(filter-out -I$(obj), $(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_verstage)))) +VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%,\ + $(patsubst $(src)/%.h,$(top)/$(src)/%.h,\ + $(filter-out -I$(obj), $(CPPFLAGS_verstage)))) VBOOT_CFLAGS += $(CFLAGS_verstage) VBOOT_CFLAGS += $(verstage-c-ccopts) -VBOOT_CFLAGS += -I$(abspath $(obj)) -include $(top)/src/include/kconfig.h -Wno-missing-prototypes +VBOOT_CFLAGS += -I$(abspath $(obj)) -Wno-missing-prototypes VBOOT_CFLAGS += -DVBOOT_DEBUG $(VB2_LIB): $(obj)/config.h diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c index ba7edff50162..24b8f9524f2e 100644 --- a/src/security/vboot/bootmode.c +++ b/src/security/vboot/bootmode.c @@ -17,7 +17,6 @@ #include <bootmode.h> #include <bootstate.h> #include <cbmem.h> -#include <compiler.h> #include <rules.h> #include <string.h> #include <vb2_api.h> diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c index ae5bdb634a90..901f126ca456 100644 --- a/src/security/vboot/vboot_common.c +++ b/src/security/vboot/vboot_common.c @@ -16,7 +16,6 @@ #include <boot/coreboot_tables.h> #include <boot_device.h> #include <cbmem.h> -#include <compiler.h> #include <console/cbmem_console.h> #include <console/console.h> #include <fmap.h> diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h index 8f03788cb628..61f5931fe554 100644 --- a/src/security/vboot/vboot_common.h +++ b/src/security/vboot/vboot_common.h @@ -17,7 +17,6 @@ #include <commonlib/region.h> #include <stdint.h> -#include <compiler.h> #include <vboot_api.h> #include <vboot_struct.h> diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index a0e6a3210dd7..2fc20fabd47e 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -16,7 +16,6 @@ #include <arch/exception.h> #include <assert.h> #include <bootmode.h> -#include <compiler.h> #include <console/console.h> #include <console/vtxprintf.h> #include <delay.h> diff --git a/src/security/vboot/verstage.c b/src/security/vboot/verstage.c index fd75250bb4ae..afd73f11e06e 100644 --- a/src/security/vboot/verstage.c +++ b/src/security/vboot/verstage.c @@ -15,7 +15,6 @@ #include <arch/exception.h> #include <arch/hlt.h> -#include <compiler.h> #include <console/console.h> #include <program_loading.h> #include <security/vboot/vboot_common.h> diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h index 6e1a1f0f053f..25a564b457bf 100644 --- a/src/soc/amd/common/block/include/amdblocks/psp.h +++ b/src/soc/amd/common/block/include/amdblocks/psp.h @@ -19,7 +19,6 @@ #include <amdblocks/agesawrapper.h> #include <soc/pci_devs.h> #include <stdint.h> -#include <compiler.h> /* Extra, Special Purpose Registers in the PSP PCI Config Space */ diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c index f2ece80f6289..49a2c4c9988b 100644 --- a/src/soc/amd/common/block/pi/agesawrapper.c +++ b/src/soc/amd/common/block/pi/agesawrapper.c @@ -19,7 +19,6 @@ #include <cpu/x86/mtrr.h> #include <cbfs.h> #include <cbmem.h> -#include <compiler.h> #include <delay.h> #include <rules.h> #include <rmodule.h> diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c index 56bd8662e713..d136084612c1 100644 --- a/src/soc/amd/common/block/pi/def_callouts.c +++ b/src/soc/amd/common/block/pi/def_callouts.c @@ -15,7 +15,6 @@ */ #include <cbfs.h> -#include <compiler.h> #include <cpu/x86/lapic.h> #include <cpu/x86/mp.h> #include <timer.h> diff --git a/src/soc/amd/stoneyridge/BiosCallOuts.c b/src/soc/amd/stoneyridge/BiosCallOuts.c index 027ba4e5d5cb..5e6c89926829 100644 --- a/src/soc/amd/stoneyridge/BiosCallOuts.c +++ b/src/soc/amd/stoneyridge/BiosCallOuts.c @@ -15,7 +15,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <device/device.h> #include <device/pci_def.h> #include <amdblocks/BiosCallOuts.h> diff --git a/src/soc/amd/stoneyridge/gpio.c b/src/soc/amd/stoneyridge/gpio.c index b4b7acfe8894..b469f820b210 100644 --- a/src/soc/amd/stoneyridge/gpio.c +++ b/src/soc/amd/stoneyridge/gpio.c @@ -21,7 +21,6 @@ #include <soc/gpio.h> #include <soc/southbridge.h> #include <assert.h> -#include <compiler.h> static const struct soc_amd_event gpio_event_table[] = { { GPIO_1, GEVENT_19 }, diff --git a/src/soc/amd/stoneyridge/include/soc/nvs.h b/src/soc/amd/stoneyridge/include/soc/nvs.h index 1477358a2444..3e6ef3042bbf 100644 --- a/src/soc/amd/stoneyridge/include/soc/nvs.h +++ b/src/soc/amd/stoneyridge/include/soc/nvs.h @@ -25,7 +25,6 @@ #define __SOC_STONEYRIDGE_NVS_H__ #include <commonlib/helpers.h> -#include <compiler.h> #include <stdint.h> #include <vendorcode/google/chromeos/gnvs.h> #include <soc/southbridge.h> diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c index a5acaf6f058b..555e9015018c 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -17,7 +17,6 @@ #include <arch/io.h> #include <arch/cpu.h> #include <arch/acpi.h> -#include <compiler.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <cpu/amd/mtrr.h> diff --git a/src/soc/amd/stoneyridge/usb.c b/src/soc/amd/stoneyridge/usb.c index 6007af116bdc..14feef3e3e08 100644 --- a/src/soc/amd/stoneyridge/usb.c +++ b/src/soc/amd/stoneyridge/usb.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index ba10e3556217..9ee6dbb96d5d 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -20,7 +20,6 @@ #include <arch/acpi.h> #include <bootstate.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <cpu/cpu.h> #include <cpu/x86/mp.h> diff --git a/src/soc/intel/apollolake/cse.c b/src/soc/intel/apollolake/cse.c index 8842500fa8e0..9051dc330428 100644 --- a/src/soc/intel/apollolake/cse.c +++ b/src/soc/intel/apollolake/cse.c @@ -22,7 +22,6 @@ #include <soc/pci_devs.h> #include <device/pci_ops.h> #include <stdint.h> -#include <compiler.h> #define PCI_ME_HFSTS1 0x40 #define PCI_ME_HFSTS2 0x48 diff --git a/src/soc/intel/apollolake/include/soc/nvs.h b/src/soc/intel/apollolake/include/soc/nvs.h index 3250aeb27713..6c37d5977bae 100644 --- a/src/soc/intel/apollolake/include/soc/nvs.h +++ b/src/soc/intel/apollolake/include/soc/nvs.h @@ -25,7 +25,6 @@ #define _SOC_APOLLOLAKE_NVS_H_ #include <commonlib/helpers.h> -#include <compiler.h> #include <vendorcode/google/chromeos/gnvs.h> typedef struct global_nvs_t { diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h index 6de39a068c3f..c4f1d1b39c7e 100644 --- a/src/soc/intel/apollolake/include/soc/pm.h +++ b/src/soc/intel/apollolake/include/soc/pm.h @@ -19,7 +19,6 @@ #define _SOC_APOLLOLAKE_PM_H_ #include <stdint.h> -#include <compiler.h> #include <arch/acpi.h> #include <soc/gpe.h> #include <soc/iomap.h> diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index 416877103c30..995564d7173d 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -24,7 +24,6 @@ #include <bootmode.h> #include <cbfs.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/pae.h> @@ -52,7 +51,6 @@ #include <timestamp.h> #include <timer.h> #include <delay.h> -#include <compiler.h> #include "chip.h" static const uint8_t hob_variable_guid[16] = { diff --git a/src/soc/intel/baytrail/gpio.c b/src/soc/intel/baytrail/gpio.c index 451993df2fde..743ab9fbef60 100644 --- a/src/soc/intel/baytrail/gpio.c +++ b/src/soc/intel/baytrail/gpio.c @@ -14,7 +14,6 @@ */ #include <device/pci.h> -#include <compiler.h> #include <console/console.h> #include <soc/gpio.h> #include <soc/pmc.h> diff --git a/src/soc/intel/baytrail/include/soc/device_nvs.h b/src/soc/intel/baytrail/include/soc/device_nvs.h index bc6f7ec5de18..74e312a858c3 100644 --- a/src/soc/intel/baytrail/include/soc/device_nvs.h +++ b/src/soc/intel/baytrail/include/soc/device_nvs.h @@ -17,7 +17,6 @@ #define _BAYTRAIL_DEVICE_NVS_H_ #include <stdint.h> -#include <compiler.h> #define LPSS_NVS_SIO_DMA1 0 #define LPSS_NVS_I2C1 1 diff --git a/src/soc/intel/baytrail/include/soc/efi_wrapper.h b/src/soc/intel/baytrail/include/soc/efi_wrapper.h index 3425aae82334..d362494638e1 100644 --- a/src/soc/intel/baytrail/include/soc/efi_wrapper.h +++ b/src/soc/intel/baytrail/include/soc/efi_wrapper.h @@ -29,8 +29,6 @@ #ifndef __EFI_WRAPPER_H__ #define __EFI_WRAPPER_H__ -#include <compiler.h> - #define EFI_WRAPPER_VER 2 /* Provide generic x86 calling conventions. */ diff --git a/src/soc/intel/baytrail/include/soc/gpio.h b/src/soc/intel/baytrail/include/soc/gpio.h index 93e80cbab255..474aaea314f6 100644 --- a/src/soc/intel/baytrail/include/soc/gpio.h +++ b/src/soc/intel/baytrail/include/soc/gpio.h @@ -17,7 +17,6 @@ #define _BAYTRAIL_GPIO_H_ #include <stdint.h> -#include <compiler.h> #include <arch/io.h> #include <soc/iomap.h> diff --git a/src/soc/intel/baytrail/include/soc/mrc_wrapper.h b/src/soc/intel/baytrail/include/soc/mrc_wrapper.h index d3547c2fb2ee..d7f4483820f0 100644 --- a/src/soc/intel/baytrail/include/soc/mrc_wrapper.h +++ b/src/soc/intel/baytrail/include/soc/mrc_wrapper.h @@ -28,8 +28,6 @@ #ifndef _MRC_WRAPPER_H_ #define _MRC_WRAPPER_H_ -#include <compiler.h> - #define MRC_PARAMS_VER 5 #define NUM_CHANNELS 2 diff --git a/src/soc/intel/baytrail/include/soc/nvs.h b/src/soc/intel/baytrail/include/soc/nvs.h index 715929d7ea15..08ccbf44ff67 100644 --- a/src/soc/intel/baytrail/include/soc/nvs.h +++ b/src/soc/intel/baytrail/include/soc/nvs.h @@ -18,7 +18,6 @@ #define _BAYTRAIL_NVS_H_ #include <commonlib/helpers.h> -#include <compiler.h> #include <vendorcode/google/chromeos/gnvs.h> #include <soc/device_nvs.h> diff --git a/src/soc/intel/baytrail/include/soc/pmc.h b/src/soc/intel/baytrail/include/soc/pmc.h index c287d9cea97a..bc8e8776970a 100644 --- a/src/soc/intel/baytrail/include/soc/pmc.h +++ b/src/soc/intel/baytrail/include/soc/pmc.h @@ -16,7 +16,6 @@ #ifndef _BAYTRAIL_PMC_H_ #define _BAYTRAIL_PMC_H_ -#include <compiler.h> #include <arch/acpi.h> #define IOCOM1 0x3f8 diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c index 83f4227bff3c..0ef70d020b22 100644 --- a/src/soc/intel/baytrail/southcluster.c +++ b/src/soc/intel/baytrail/southcluster.c @@ -19,7 +19,6 @@ #include <arch/acpi.h> #include <bootstate.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <cpu/x86/smm.h> #include <device/device.h> diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c index c42b39859460..d81b878e5184 100644 --- a/src/soc/intel/baytrail/spi.c +++ b/src/soc/intel/baytrail/spi.c @@ -14,7 +14,6 @@ /* This file is derived from the flashrom project. */ #include <stdint.h> -#include <compiler.h> #include <stdlib.h> #include <string.h> #include <bootstate.h> diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 0a683fba6bce..c11adb9d41d3 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -22,7 +22,6 @@ #include <arch/smp/mpspec.h> #include <cbfs.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <cpu/cpu.h> #include <cpu/intel/turbo.h> diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c index 35cbd156eb6d..4d135390f6e0 100644 --- a/src/soc/intel/braswell/chip.c +++ b/src/soc/intel/braswell/chip.c @@ -15,7 +15,6 @@ */ #include <chip.h> -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/soc/intel/braswell/gpio.c b/src/soc/intel/braswell/gpio.c index 23be45a1c1f4..a5b289401fc5 100644 --- a/src/soc/intel/braswell/gpio.c +++ b/src/soc/intel/braswell/gpio.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <device/pci.h> #include <soc/gpio.h> diff --git a/src/soc/intel/braswell/include/soc/device_nvs.h b/src/soc/intel/braswell/include/soc/device_nvs.h index 8ed534eb9129..e98337cdeaa4 100644 --- a/src/soc/intel/braswell/include/soc/device_nvs.h +++ b/src/soc/intel/braswell/include/soc/device_nvs.h @@ -18,7 +18,6 @@ #define _SOC_DEVICE_NVS_H_ #include <stdint.h> -#include <compiler.h> #define LPSS_NVS_SIO_DMA1 0 #define LPSS_NVS_I2C1 1 diff --git a/src/soc/intel/braswell/include/soc/gpio.h b/src/soc/intel/braswell/include/soc/gpio.h index 6b382fc17127..894096f59a01 100644 --- a/src/soc/intel/braswell/include/soc/gpio.h +++ b/src/soc/intel/braswell/include/soc/gpio.h @@ -18,7 +18,6 @@ #define _SOC_GPIO_H_ #include <stdint.h> -#include <compiler.h> #include <arch/io.h> #include <soc/gpio_defs.h> #include <soc/iomap.h> diff --git a/src/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h index 05831bb7d1a0..7f044a5d216a 100644 --- a/src/soc/intel/braswell/include/soc/nvs.h +++ b/src/soc/intel/braswell/include/soc/nvs.h @@ -19,7 +19,6 @@ #define _SOC_NVS_H_ #include <commonlib/helpers.h> -#include <compiler.h> #include <rules.h> #include <soc/device_nvs.h> #include <vendorcode/google/chromeos/gnvs.h> diff --git a/src/soc/intel/braswell/include/soc/pm.h b/src/soc/intel/braswell/include/soc/pm.h index 5ac29f4e307d..5d8c332feb5f 100644 --- a/src/soc/intel/braswell/include/soc/pm.h +++ b/src/soc/intel/braswell/include/soc/pm.h @@ -17,7 +17,6 @@ #ifndef _SOC_PM_H_ #define _SOC_PM_H_ -#include <compiler.h> #include <arch/acpi.h> #define IOCOM1 0x3f8 diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c index 24d4b8b4764e..14b412a03f88 100644 --- a/src/soc/intel/braswell/southcluster.c +++ b/src/soc/intel/braswell/southcluster.c @@ -21,7 +21,6 @@ #include <bootstate.h> #include <cbmem.h> #include "chip.h" -#include <compiler.h> #include <console/console.h> #include <cpu/x86/smm.h> #include <device/device.h> diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c index f2d178d11a23..0f42a90e2dbc 100644 --- a/src/soc/intel/braswell/spi.c +++ b/src/soc/intel/braswell/spi.c @@ -26,7 +26,6 @@ #include <spi_flash.h> #include <spi-generic.h> #include <stdint.h> -#include <compiler.h> #include <stdlib.h> #include <string.h> diff --git a/src/soc/intel/broadwell/include/soc/device_nvs.h b/src/soc/intel/broadwell/include/soc/device_nvs.h index d17b3d461e9d..c37816cfbaf1 100644 --- a/src/soc/intel/broadwell/include/soc/device_nvs.h +++ b/src/soc/intel/broadwell/include/soc/device_nvs.h @@ -17,7 +17,6 @@ #define _BROADWELL_DEVICE_NVS_H_ #include <stdint.h> -#include <compiler.h> #define SIO_NVS_DMA 0 #define SIO_NVS_I2C0 1 diff --git a/src/soc/intel/broadwell/include/soc/gpio.h b/src/soc/intel/broadwell/include/soc/gpio.h index d5ff7bb29543..66820b21845f 100644 --- a/src/soc/intel/broadwell/include/soc/gpio.h +++ b/src/soc/intel/broadwell/include/soc/gpio.h @@ -17,7 +17,6 @@ #define _BROADWELL_GPIO_H_ #include <stdint.h> -#include <compiler.h> #define CROS_GPIO_DEVICE_NAME "PCH-LP" #define CROS_GPIO_ACPI_DEVICE_NAME "INT3437:00" diff --git a/src/soc/intel/broadwell/include/soc/me.h b/src/soc/intel/broadwell/include/soc/me.h index 34b44816e875..a213e37047a8 100644 --- a/src/soc/intel/broadwell/include/soc/me.h +++ b/src/soc/intel/broadwell/include/soc/me.h @@ -16,7 +16,6 @@ #ifndef _BROADWELL_ME_H_ #define _BROADWELL_ME_H_ -#include <compiler.h> #include <commonlib/loglevel.h> #define ME_RETRY 100000 /* 1 second */ diff --git a/src/soc/intel/broadwell/include/soc/nvs.h b/src/soc/intel/broadwell/include/soc/nvs.h index 2e51e1bd205d..63c7bde23bfe 100644 --- a/src/soc/intel/broadwell/include/soc/nvs.h +++ b/src/soc/intel/broadwell/include/soc/nvs.h @@ -18,7 +18,6 @@ #define _BROADWELL_NVS_H_ #include <commonlib/helpers.h> -#include <compiler.h> #include <soc/device_nvs.h> #include <vendorcode/google/chromeos/gnvs.h> diff --git a/src/soc/intel/broadwell/include/soc/pei_data.h b/src/soc/intel/broadwell/include/soc/pei_data.h index d12011e797b5..989ca06733c0 100644 --- a/src/soc/intel/broadwell/include/soc/pei_data.h +++ b/src/soc/intel/broadwell/include/soc/pei_data.h @@ -30,7 +30,6 @@ #define PEI_DATA_H #include <types.h> -#include <compiler.h> #define PEI_VERSION 22 diff --git a/src/soc/intel/broadwell/include/soc/smm.h b/src/soc/intel/broadwell/include/soc/smm.h index 9a749c9051da..75e78337c24a 100644 --- a/src/soc/intel/broadwell/include/soc/smm.h +++ b/src/soc/intel/broadwell/include/soc/smm.h @@ -17,7 +17,6 @@ #define _BROADWELL_SMM_H_ #include <stdint.h> -#include <compiler.h> #include <cpu/x86/msr.h> struct ied_header { diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c index 142f3b337581..a6691ab9f93c 100644 --- a/src/soc/intel/broadwell/romstage/romstage.c +++ b/src/soc/intel/broadwell/romstage/romstage.c @@ -20,7 +20,6 @@ #include <arch/cbfs.h> #include <arch/early_variables.h> #include <bootmode.h> -#include <compiler.h> #include <console/console.h> #include <cbfs.h> #include <cbmem.h> diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c index 7d862f250df0..2b2d603b68e4 100644 --- a/src/soc/intel/broadwell/spi.c +++ b/src/soc/intel/broadwell/spi.c @@ -13,7 +13,6 @@ /* This file is derived from the flashrom project. */ #include <stdint.h> -#include <compiler.h> #include <stdlib.h> #include <string.h> #include <bootstate.h> diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index 014805f593e6..6a3324b7fdc7 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -14,7 +14,6 @@ */ #include <chip.h> -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c index cbc97b22cde3..9befdc8fdad6 100644 --- a/src/soc/intel/cannonlake/fsp_params.c +++ b/src/soc/intel/cannonlake/fsp_params.c @@ -14,7 +14,6 @@ */ #include <chip.h> -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/soc/intel/cannonlake/include/soc/nvs.h b/src/soc/intel/cannonlake/include/soc/nvs.h index 1e5562566d63..1cb22faa7407 100644 --- a/src/soc/intel/cannonlake/include/soc/nvs.h +++ b/src/soc/intel/cannonlake/include/soc/nvs.h @@ -19,7 +19,6 @@ #define _SOC_NVS_H_ #include <commonlib/helpers.h> -#include <compiler.h> #include <vendorcode/google/chromeos/gnvs.h> typedef struct global_nvs_t { diff --git a/src/soc/intel/cannonlake/include/soc/pm.h b/src/soc/intel/cannonlake/include/soc/pm.h index 1494d561d8e9..1661ece8073c 100644 --- a/src/soc/intel/cannonlake/include/soc/pm.h +++ b/src/soc/intel/cannonlake/include/soc/pm.h @@ -142,7 +142,6 @@ #include <arch/acpi.h> #include <arch/io.h> -#include <compiler.h> #include <soc/gpe.h> #include <soc/iomap.h> #include <soc/smbus.h> diff --git a/src/soc/intel/cannonlake/reset.c b/src/soc/intel/cannonlake/reset.c index 140fbff6a529..eae94cf6c595 100644 --- a/src/soc/intel/cannonlake/reset.c +++ b/src/soc/intel/cannonlake/reset.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <intelblocks/cse.h> #include <intelblocks/pmclib.h> diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c index 6f610b6eec53..246e0eac05f6 100644 --- a/src/soc/intel/cannonlake/romstage/romstage.c +++ b/src/soc/intel/cannonlake/romstage/romstage.c @@ -19,7 +19,6 @@ #include <chip.h> #include <cpu/x86/mtrr.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <fsp/util.h> #include <intelblocks/chip.h> diff --git a/src/soc/intel/common/acpi_wake_source.c b/src/soc/intel/common/acpi_wake_source.c index e0d8bfb8fcbf..f66706c4cdbb 100644 --- a/src/soc/intel/common/acpi_wake_source.c +++ b/src/soc/intel/common/acpi_wake_source.c @@ -16,7 +16,6 @@ #include <arch/acpi.h> #include <bootstate.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <soc/nvs.h> #include <stdint.h> diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 8fdaeeeaa957..c2f059428328 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -18,7 +18,6 @@ #include <arch/smp/mpspec.h> #include <bootstate.h> #include <cbmem.h> -#include <compiler.h> #include <cpu/intel/reset.h> #include <cpu/intel/turbo.h> #include <cpu/x86/msr.h> diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c index dd5cc4484585..af49c0a6613b 100644 --- a/src/soc/intel/common/block/cpu/mp_init.c +++ b/src/soc/intel/common/block/cpu/mp_init.c @@ -16,7 +16,6 @@ #include <arch/io.h> #include <assert.h> #include <bootstate.h> -#include <compiler.h> #include <cpu/cpu.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/msr.h> diff --git a/src/soc/intel/common/block/ebda/ebda.c b/src/soc/intel/common/block/ebda/ebda.c index 41c77a8f2c63..6b0bd6752b01 100644 --- a/src/soc/intel/common/block/ebda/ebda.c +++ b/src/soc/intel/common/block/ebda/ebda.c @@ -14,7 +14,6 @@ */ #include <arch/ebda.h> -#include <compiler.h> #include <intelblocks/ebda.h> #include <string.h> diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c index 74a5cae4bb6e..47de26990e48 100644 --- a/src/soc/intel/common/block/graphics/graphics.c +++ b/src/soc/intel/common/block/graphics/graphics.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <assert.h> #include <console/console.h> #include <device/pci.h> diff --git a/src/soc/intel/common/block/gspi/gspi.c b/src/soc/intel/common/block/gspi/gspi.c index fc7dd46ad87b..d4cb9f20ffb1 100644 --- a/src/soc/intel/common/block/gspi/gspi.c +++ b/src/soc/intel/common/block/gspi/gspi.c @@ -17,7 +17,6 @@ #include <arch/early_variables.h> #include <arch/io.h> #include <assert.h> -#include <compiler.h> #include <console/console.h> #include <delay.h> #include <device/device.h> diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index ef8417a195ac..dbea58927a22 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index c8e802617116..0e975453fd93 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -15,7 +15,6 @@ #include <arch/acpi.h> #include <arch/io.h> -#include <compiler.h> #include <console/console.h> #include <cpu/x86/smm.h> #include <device/pci.h> diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index 3fb386642a5c..cfe801145822 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/src/soc/intel/common/block/pmc/pmclib.c @@ -16,7 +16,6 @@ #include <arch/early_variables.h> #include <arch/io.h> #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <halt.h> #include <intelblocks/pmclib.h> diff --git a/src/soc/intel/common/block/rtc/rtc.c b/src/soc/intel/common/block/rtc/rtc.c index bfa11bd17779..2d70de273b41 100644 --- a/src/soc/intel/common/block/rtc/rtc.c +++ b/src/soc/intel/common/block/rtc/rtc.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <intelblocks/pcr.h> #include <intelblocks/rtc.h> #include <soc/pcr_ids.h> diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c index f90ac578e3fe..9e8d346d2437 100644 --- a/src/soc/intel/common/block/smm/smihandler.c +++ b/src/soc/intel/common/block/smm/smihandler.c @@ -16,7 +16,6 @@ #include <arch/hlt.h> #include <arch/io.h> -#include <compiler.h> #include <console/console.h> #include <cpu/x86/cache.h> #include <cpu/x86/smm.h> diff --git a/src/soc/intel/common/block/sram/sram.c b/src/soc/intel/common/block/sram/sram.c index 9028952286fc..e38d47852ad0 100644 --- a/src/soc/intel/common/block/sram/sram.c +++ b/src/soc/intel/common/block/sram/sram.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c index 225914c5b57b..c25cab7ba572 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -15,7 +15,6 @@ #include <arch/io.h> #include <cbmem.h> -#include <compiler.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c index 12b99e737e86..d964b90b382f 100644 --- a/src/soc/intel/common/block/uart/uart.c +++ b/src/soc/intel/common/block/uart/uart.c @@ -15,7 +15,6 @@ #include <arch/acpi.h> #include <assert.h> -#include <compiler.h> #include <cbmem.h> #include <console/uart.h> #include <device/device.h> diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c index eb330ee6eef5..119decd71faf 100644 --- a/src/soc/intel/common/block/xdci/xdci.c +++ b/src/soc/intel/common/block/xdci/xdci.c @@ -15,7 +15,6 @@ */ #include <arch/io.h> -#include <compiler.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index c38d19f034d5..0f4868a9694e 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/common/mma.c b/src/soc/intel/common/mma.c index 541a7b4d43ee..77f8c1e22766 100644 --- a/src/soc/intel/common/mma.c +++ b/src/soc/intel/common/mma.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <bootstate.h> #include <cbfs.h> #include <cbmem.h> diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c index ab52dc8d04c9..9eaa2cb04885 100644 --- a/src/soc/intel/common/vbt.c +++ b/src/soc/intel/common/vbt.c @@ -14,7 +14,6 @@ */ #include <cbfs.h> -#include <compiler.h> #include <console/console.h> #include <arch/acpi.h> #include <bootmode.h> diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c index 6a947ff83f1c..71e396004f73 100644 --- a/src/soc/intel/denverton_ns/acpi.c +++ b/src/soc/intel/denverton_ns/acpi.c @@ -19,7 +19,6 @@ #include <arch/acpi.h> #include <arch/acpigen.h> #include <arch/smp/mpspec.h> -#include <compiler.h> #include <cpu/x86/smm.h> #include <string.h> #include <device/pci.h> diff --git a/src/soc/intel/denverton_ns/fiamux.c b/src/soc/intel/denverton_ns/fiamux.c index 418ccfa3226c..fc18a41312fe 100644 --- a/src/soc/intel/denverton_ns/fiamux.c +++ b/src/soc/intel/denverton_ns/fiamux.c @@ -15,7 +15,6 @@ * */ -#include <compiler.h> #include <console/console.h> #include <soc/fiamux.h> diff --git a/src/soc/intel/denverton_ns/romstage.c b/src/soc/intel/denverton_ns/romstage.c index 3da349a63f3e..cf4ae7c1ed15 100644 --- a/src/soc/intel/denverton_ns/romstage.c +++ b/src/soc/intel/denverton_ns/romstage.c @@ -15,7 +15,6 @@ */ #include <cbmem.h> -#include <compiler.h> #include <console/console.h> #include <cpu/x86/mtrr.h> #include <reset.h> diff --git a/src/soc/intel/fsp_baytrail/gpio.c b/src/soc/intel/fsp_baytrail/gpio.c index 72ba517d5243..3cc69b944102 100644 --- a/src/soc/intel/fsp_baytrail/gpio.c +++ b/src/soc/intel/fsp_baytrail/gpio.c @@ -14,7 +14,6 @@ */ #include <device/pci.h> -#include <compiler.h> #include <console/console.h> #include <soc/gpio.h> #include <soc/pmc.h> diff --git a/src/soc/intel/fsp_baytrail/include/soc/device_nvs.h b/src/soc/intel/fsp_baytrail/include/soc/device_nvs.h index 8eff8cdb6fd5..ec1e568bfd79 100644 --- a/src/soc/intel/fsp_baytrail/include/soc/device_nvs.h +++ b/src/soc/intel/fsp_baytrail/include/soc/device_nvs.h @@ -17,7 +17,6 @@ #define _BAYTRAIL_DEVICE_NVS_H_ #include <stdint.h> -#include <compiler.h> #define LPSS_NVS_SIO_DMA1 0 #define LPSS_NVS_I2C1 1 diff --git a/src/soc/intel/fsp_baytrail/include/soc/gpio.h b/src/soc/intel/fsp_baytrail/include/soc/gpio.h index 767755454bbf..13013db12196 100644 --- a/src/soc/intel/fsp_baytrail/include/soc/gpio.h +++ b/src/soc/intel/fsp_baytrail/include/soc/gpio.h @@ -17,7 +17,6 @@ #define _BAYTRAIL_GPIO_H_ #include <stdint.h> -#include <compiler.h> #include <arch/io.h> #include <soc/iomap.h> diff --git a/src/soc/intel/fsp_baytrail/include/soc/nvs.h b/src/soc/intel/fsp_baytrail/include/soc/nvs.h index f0bf888add4a..d42763a5ac6f 100644 --- a/src/soc/intel/fsp_baytrail/include/soc/nvs.h +++ b/src/soc/intel/fsp_baytrail/include/soc/nvs.h @@ -17,7 +17,6 @@ #ifndef _BAYTRAIL_NVS_H_ #define _BAYTRAIL_NVS_H_ -#include <compiler.h> #include <soc/device_nvs.h> typedef struct { diff --git a/src/soc/intel/fsp_baytrail/include/soc/pmc.h b/src/soc/intel/fsp_baytrail/include/soc/pmc.h index 9bafdc2fcf6c..b28b195c87b2 100644 --- a/src/soc/intel/fsp_baytrail/include/soc/pmc.h +++ b/src/soc/intel/fsp_baytrail/include/soc/pmc.h @@ -17,7 +17,6 @@ #ifndef _BAYTRAIL_PMC_H_ #define _BAYTRAIL_PMC_H_ -#include <compiler.h> #include <arch/acpi.h> #define IOCOM1 0x3f8 diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c index d8b1d55397ef..26d2281a68a4 100644 --- a/src/soc/intel/fsp_baytrail/spi.c +++ b/src/soc/intel/fsp_baytrail/spi.c @@ -16,7 +16,6 @@ /* This file is derived from the flashrom project. */ #include <stdint.h> -#include <compiler.h> #include <stdlib.h> #include <string.h> #include <commonlib/helpers.h> diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/gpio.h b/src/soc/intel/fsp_broadwell_de/include/soc/gpio.h index 07deeb08d6ad..1159d03910d7 100644 --- a/src/soc/intel/fsp_broadwell_de/include/soc/gpio.h +++ b/src/soc/intel/fsp_broadwell_de/include/soc/gpio.h @@ -16,7 +16,6 @@ #define FSP_BROADWELL_DE_GPIO_H_ #include <stdint.h> -#include <compiler.h> /* Chipset owned GPIO configuration registers */ #define GPIO_1_USE_SEL 0x00 diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h index 2a737aca185e..505feaf66dbd 100644 --- a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h +++ b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h @@ -18,7 +18,6 @@ #define _BROADWELL_SMM_H_ #include <stdint.h> -#include <compiler.h> #include <cpu/x86/msr.h> struct ied_header { diff --git a/src/soc/intel/fsp_broadwell_de/spi.c b/src/soc/intel/fsp_broadwell_de/spi.c index 1b1589db5b4c..a778aa927ad1 100644 --- a/src/soc/intel/fsp_broadwell_de/spi.c +++ b/src/soc/intel/fsp_broadwell_de/spi.c @@ -16,7 +16,6 @@ /* This file is derived from the flashrom project. */ #include <stdint.h> -#include <compiler.h> #include <stdlib.h> #include <string.h> #include <delay.h> diff --git a/src/soc/intel/quark/gpio_i2c.c b/src/soc/intel/quark/gpio_i2c.c index 100257bd7ad6..b2bb57280029 100644 --- a/src/soc/intel/quark/gpio_i2c.c +++ b/src/soc/intel/quark/gpio_i2c.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <delay.h> #include <device/device.h> diff --git a/src/soc/intel/quark/include/soc/pei_wrapper.h b/src/soc/intel/quark/include/soc/pei_wrapper.h index 9e63a72eadaf..c177c86e9ac7 100644 --- a/src/soc/intel/quark/include/soc/pei_wrapper.h +++ b/src/soc/intel/quark/include/soc/pei_wrapper.h @@ -31,7 +31,6 @@ #define _PEI_WRAPPER_H_ #include <types.h> -#include <compiler.h> #define PEI_VERSION 22 diff --git a/src/soc/intel/quark/include/soc/pm.h b/src/soc/intel/quark/include/soc/pm.h index ae19cc6c9d3b..c682a2430071 100644 --- a/src/soc/intel/quark/include/soc/pm.h +++ b/src/soc/intel/quark/include/soc/pm.h @@ -18,7 +18,6 @@ #define _SOC_PM_H_ #include <stdint.h> -#include <compiler.h> #include <arch/acpi.h> struct chipset_power_state { diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index d2ec7e718526..86dcc48e2008 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -23,7 +23,6 @@ #include <arch/smp/mpspec.h> #include <cbmem.h> #include <chip.h> -#include <compiler.h> #include <console/console.h> #include <cpu/cpu.h> #include <cpu/x86/smm.h> diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c index c2c074556586..039d45a507a2 100644 --- a/src/soc/intel/skylake/chip_fsp20.c +++ b/src/soc/intel/skylake/chip_fsp20.c @@ -21,7 +21,6 @@ #include <arch/acpi.h> #include <arch/io.h> #include <chip.h> -#include <compiler.h> #include <bootstate.h> #include <console/console.h> #include <device/device.h> diff --git a/src/soc/intel/skylake/include/soc/device_nvs.h b/src/soc/intel/skylake/include/soc/device_nvs.h index 2b7d1267fcd3..4dbc99a0753b 100644 --- a/src/soc/intel/skylake/include/soc/device_nvs.h +++ b/src/soc/intel/skylake/include/soc/device_nvs.h @@ -18,7 +18,6 @@ #define _SOC_DEVICE_NVS_H_ #include <stdint.h> -#include <compiler.h> #define SIO_NVS_I2C0 0 #define SIO_NVS_I2C1 1 diff --git a/src/soc/intel/skylake/include/soc/me.h b/src/soc/intel/skylake/include/soc/me.h index 590bfb722dce..5a9acd51f311 100644 --- a/src/soc/intel/skylake/include/soc/me.h +++ b/src/soc/intel/skylake/include/soc/me.h @@ -18,8 +18,6 @@ #ifndef _SKYLAKE_ME_H_ #define _SKYLAKE_ME_H_ -#include <compiler.h> - /* * Management Engine PCI registers */ diff --git a/src/soc/intel/skylake/include/soc/nvs.h b/src/soc/intel/skylake/include/soc/nvs.h index 53fdded8e969..7102a78a325d 100644 --- a/src/soc/intel/skylake/include/soc/nvs.h +++ b/src/soc/intel/skylake/include/soc/nvs.h @@ -19,7 +19,6 @@ #define _SOC_NVS_H_ #include <commonlib/helpers.h> -#include <compiler.h> #include <rules.h> #include <vendorcode/google/chromeos/gnvs.h> diff --git a/src/soc/intel/skylake/include/soc/pei_data.h b/src/soc/intel/skylake/include/soc/pei_data.h index 58485837c6a6..02e04c6c0232 100644 --- a/src/soc/intel/skylake/include/soc/pei_data.h +++ b/src/soc/intel/skylake/include/soc/pei_data.h @@ -31,7 +31,6 @@ #define _PEI_DATA_H_ #include <types.h> -#include <compiler.h> #define PEI_VERSION 22 diff --git a/src/soc/intel/skylake/include/soc/pm.h b/src/soc/intel/skylake/include/soc/pm.h index b7d644654384..47e39415310c 100644 --- a/src/soc/intel/skylake/include/soc/pm.h +++ b/src/soc/intel/skylake/include/soc/pm.h @@ -17,7 +17,6 @@ #ifndef _SOC_PM_H_ #define _SOC_PM_H_ -#include <compiler.h> #include <arch/acpi.h> #include <arch/io.h> #include <soc/gpe.h> diff --git a/src/soc/intel/skylake/include/soc/smm.h b/src/soc/intel/skylake/include/soc/smm.h index 0f857e05ce50..819544095210 100644 --- a/src/soc/intel/skylake/include/soc/smm.h +++ b/src/soc/intel/skylake/include/soc/smm.h @@ -18,7 +18,6 @@ #define _SOC_SMM_H_ #include <stdint.h> -#include <compiler.h> #include <cpu/x86/msr.h> #include <fsp/memmap.h> #include <intelblocks/smihandler.h> diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c index 5a4fe6b6297a..6baa568efa0a 100644 --- a/src/soc/intel/skylake/me.c +++ b/src/soc/intel/skylake/me.c @@ -16,7 +16,6 @@ #include <arch/io.h> #include <bootstate.h> #include <commonlib/helpers.h> -#include <compiler.h> #include <console/console.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/skylake/romstage/romstage_fsp20.c b/src/soc/intel/skylake/romstage/romstage_fsp20.c index 45fb2d0ef300..0945780c9f28 100644 --- a/src/soc/intel/skylake/romstage/romstage_fsp20.c +++ b/src/soc/intel/skylake/romstage/romstage_fsp20.c @@ -18,7 +18,6 @@ #include <arch/io.h> #include <arch/symbols.h> #include <assert.h> -#include <compiler.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/msr.h> #include <cbmem.h> diff --git a/src/soc/mediatek/common/mmu_operations.c b/src/soc/mediatek/common/mmu_operations.c index 27a03e3317a5..44670702de38 100644 --- a/src/soc/mediatek/common/mmu_operations.c +++ b/src/soc/mediatek/common/mmu_operations.c @@ -14,7 +14,6 @@ */ #include <arch/mmu.h> -#include <compiler.h> #include <symbols.h> #include <soc/emi.h> #include <soc/mmu_operations.h> diff --git a/src/soc/mediatek/common/timer.c b/src/soc/mediatek/common/timer.c index 6e4315c7cfec..b05d29e0bfb9 100644 --- a/src/soc/mediatek/common/timer.c +++ b/src/soc/mediatek/common/timer.c @@ -14,7 +14,6 @@ */ #include <arch/io.h> -#include <compiler.h> #include <console/console.h> #include <timer.h> #include <delay.h> diff --git a/src/soc/mediatek/common/uart.c b/src/soc/mediatek/common/uart.c index cfc469bed6dd..bc8053c6ab38 100644 --- a/src/soc/mediatek/common/uart.c +++ b/src/soc/mediatek/common/uart.c @@ -19,7 +19,6 @@ #include <console/uart.h> #include <drivers/uart/uart8250reg.h> #include <stdint.h> -#include <compiler.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra124/include/soc/clk_rst.h b/src/soc/nvidia/tegra124/include/soc/clk_rst.h index 7cac4ba31997..07e710a9f3a7 100644 --- a/src/soc/nvidia/tegra124/include/soc/clk_rst.h +++ b/src/soc/nvidia/tegra124/include/soc/clk_rst.h @@ -16,8 +16,6 @@ #ifndef _TEGRA124_CLK_RST_H_ #define _TEGRA124_CLK_RST_H_ -#include <compiler.h> - /* Clock/Reset Controller (CLK_RST_CONTROLLER_) regs */ struct __packed clk_rst_ctlr { u32 rst_src; /* _RST_SOURCE, 0x000 */ diff --git a/src/soc/nvidia/tegra124/include/soc/dma.h b/src/soc/nvidia/tegra124/include/soc/dma.h index 4cb1dea616bc..42c70275f563 100644 --- a/src/soc/nvidia/tegra124/include/soc/dma.h +++ b/src/soc/nvidia/tegra124/include/soc/dma.h @@ -19,7 +19,6 @@ #define __NVIDIA_TEGRA124_DMA_H__ #include <inttypes.h> -#include <compiler.h> #include <soc/addressmap.h> /* diff --git a/src/soc/nvidia/tegra124/include/soc/emc.h b/src/soc/nvidia/tegra124/include/soc/emc.h index 1311f9efa2d6..8e190f935833 100644 --- a/src/soc/nvidia/tegra124/include/soc/emc.h +++ b/src/soc/nvidia/tegra124/include/soc/emc.h @@ -19,7 +19,6 @@ #include <stddef.h> #include <stdint.h> -#include <compiler.h> enum { EMC_PIN_RESET_MASK = 1 << 8, diff --git a/src/soc/nvidia/tegra124/include/soc/spi.h b/src/soc/nvidia/tegra124/include/soc/spi.h index 80ced3768989..875e88032aee 100644 --- a/src/soc/nvidia/tegra124/include/soc/spi.h +++ b/src/soc/nvidia/tegra124/include/soc/spi.h @@ -19,7 +19,6 @@ #include <spi-generic.h> #include <soc/dma.h> #include <stddef.h> -#include <compiler.h> struct tegra_spi_regs { u32 command1; /* 0x000: SPI_COMMAND1 */ diff --git a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c index a8b2e69ea0e7..7cc320405a0b 100644 --- a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c +++ b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c @@ -15,7 +15,6 @@ */ #include <stdint.h> -#include <compiler.h> /* Function unit addresses. */ enum { diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c index 5cb8112d816a..50c395658a27 100644 --- a/src/soc/nvidia/tegra124/uart.c +++ b/src/soc/nvidia/tegra124/uart.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <arch/io.h> #include <boot/coreboot_tables.h> #include <console/console.h> /* for __console definition */ diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c index 4d1ddf5d6023..353644710d1a 100644 --- a/src/soc/nvidia/tegra210/bootblock.c +++ b/src/soc/nvidia/tegra210/bootblock.c @@ -17,7 +17,6 @@ #include <arch/hlt.h> #include <arch/stages.h> #include <bootblock_common.h> -#include <compiler.h> #include <console/console.h> #include <delay.h> #include <program_loading.h> diff --git a/src/soc/nvidia/tegra210/funitcfg.c b/src/soc/nvidia/tegra210/funitcfg.c index e8d0c9754d33..b4319d59d6a9 100644 --- a/src/soc/nvidia/tegra210/funitcfg.c +++ b/src/soc/nvidia/tegra210/funitcfg.c @@ -14,7 +14,6 @@ */ #include <arch/io.h> -#include <compiler.h> #include <soc/addressmap.h> #include <soc/clock.h> #include <soc/funitcfg.h> diff --git a/src/soc/nvidia/tegra210/include/soc/clk_rst.h b/src/soc/nvidia/tegra210/include/soc/clk_rst.h index 652bcaaf2722..42eebedbc7e4 100644 --- a/src/soc/nvidia/tegra210/include/soc/clk_rst.h +++ b/src/soc/nvidia/tegra210/include/soc/clk_rst.h @@ -17,7 +17,6 @@ #define _TEGRA210_CLK_RST_H_ #include <stdint.h> #include <stddef.h> -#include <compiler.h> /* Clock/Reset Controller (CLK_RST_CONTROLLER_) regs */ struct __packed clk_rst_ctlr { diff --git a/src/soc/nvidia/tegra210/include/soc/clst_clk.h b/src/soc/nvidia/tegra210/include/soc/clst_clk.h index 0b9b18dc06a6..661fd1d849c0 100644 --- a/src/soc/nvidia/tegra210/include/soc/clst_clk.h +++ b/src/soc/nvidia/tegra210/include/soc/clst_clk.h @@ -16,8 +16,6 @@ #ifndef _TEGRA210_CLST_CLK_H_ #define _TEGRA210_CLST_CLK_H_ -#include <compiler.h> - /* Cluster Clock (CLUSTER_CLOCKS_PUBLIC_) regs */ struct __packed clst_clk_ctlr { u32 pllx_base; /* _PLLX_BASE, 0x000 */ diff --git a/src/soc/nvidia/tegra210/include/soc/dma.h b/src/soc/nvidia/tegra210/include/soc/dma.h index f8bd92befd93..1093479d5ffa 100644 --- a/src/soc/nvidia/tegra210/include/soc/dma.h +++ b/src/soc/nvidia/tegra210/include/soc/dma.h @@ -18,7 +18,6 @@ #define __NVIDIA_TEGRA210_DMA_H__ #include <inttypes.h> -#include <compiler.h> #include <soc/addressmap.h> /* diff --git a/src/soc/nvidia/tegra210/include/soc/emc.h b/src/soc/nvidia/tegra210/include/soc/emc.h index 8ba23a0bb085..289aa72612a1 100644 --- a/src/soc/nvidia/tegra210/include/soc/emc.h +++ b/src/soc/nvidia/tegra210/include/soc/emc.h @@ -19,7 +19,6 @@ #include <stddef.h> #include <stdint.h> -#include <compiler.h> enum { EMC_PIN_RESET_MASK = 1 << 8, diff --git a/src/soc/nvidia/tegra210/include/soc/spi.h b/src/soc/nvidia/tegra210/include/soc/spi.h index 7508792d7688..46c1c3c063dc 100644 --- a/src/soc/nvidia/tegra210/include/soc/spi.h +++ b/src/soc/nvidia/tegra210/include/soc/spi.h @@ -17,7 +17,6 @@ #ifndef __NVIDIA_TEGRA210_SPI_H__ #define __NVIDIA_TEGRA210_SPI_H__ -#include <compiler.h> #include <soc/dma.h> #include <spi-generic.h> #include <stddef.h> diff --git a/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c b/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c index 108b3b07de39..51e75f5da97a 100644 --- a/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c +++ b/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c @@ -15,7 +15,6 @@ */ #include <stdint.h> -#include <compiler.h> /* Function unit addresses. */ enum { diff --git a/src/soc/nvidia/tegra210/romstage.c b/src/soc/nvidia/tegra210/romstage.c index 8958a6bb1e6b..07bf5d43f824 100644 --- a/src/soc/nvidia/tegra210/romstage.c +++ b/src/soc/nvidia/tegra210/romstage.c @@ -17,7 +17,6 @@ #include <arch/stages.h> #include <cbfs.h> #include <cbmem.h> -#include <compiler.h> #include <console/cbmem_console.h> #include <console/console.h> #include <lib.h> diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c index 97dc740ebf94..b7cec3d1711b 100644 --- a/src/soc/nvidia/tegra210/uart.c +++ b/src/soc/nvidia/tegra210/uart.c @@ -19,7 +19,6 @@ #include <console/uart.h> #include <drivers/uart/uart8250reg.h> #include <stdint.h> -#include <compiler.h> struct tegra210_uart { union { diff --git a/src/soc/qualcomm/ipq40xx/include/soc/cdp.h b/src/soc/qualcomm/ipq40xx/include/soc/cdp.h index dbff384cd762..05a17c2e7350 100644 --- a/src/soc/qualcomm/ipq40xx/include/soc/cdp.h +++ b/src/soc/qualcomm/ipq40xx/include/soc/cdp.h @@ -32,7 +32,6 @@ #define _IPQ40XX_CDP_H_ #include <types.h> -#include <compiler.h> unsigned smem_get_board_machtype(void); diff --git a/src/soc/qualcomm/ipq40xx/lcc.c b/src/soc/qualcomm/ipq40xx/lcc.c index 5d3738c1affe..caddf19642d0 100644 --- a/src/soc/qualcomm/ipq40xx/lcc.c +++ b/src/soc/qualcomm/ipq40xx/lcc.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <stdint.h> -#include <compiler.h> #include <delay.h> #include <console/console.h> #include <soc/clock.h> diff --git a/src/soc/qualcomm/ipq806x/include/soc/cdp.h b/src/soc/qualcomm/ipq806x/include/soc/cdp.h index f6afb313ccc7..89636ace186b 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/cdp.h +++ b/src/soc/qualcomm/ipq806x/include/soc/cdp.h @@ -17,7 +17,6 @@ #define _IPQ806X_CDP_H_ #include <types.h> -#include <compiler.h> unsigned smem_get_board_machtype(void); diff --git a/src/soc/qualcomm/ipq806x/lcc.c b/src/soc/qualcomm/ipq806x/lcc.c index 99994e928b9a..6aefea2351d8 100644 --- a/src/soc/qualcomm/ipq806x/lcc.c +++ b/src/soc/qualcomm/ipq806x/lcc.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <stdint.h> -#include <compiler.h> #include <delay.h> #include <console/console.h> #include <soc/clock.h> diff --git a/src/soc/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c index 19ef667896ce..f1bc3a41c951 100644 --- a/src/soc/samsung/exynos5250/i2c.c +++ b/src/soc/samsung/exynos5250/i2c.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <arch/io.h> #include <assert.h> #include <console/console.h> diff --git a/src/soc/samsung/exynos5250/include/soc/power.h b/src/soc/samsung/exynos5250/include/soc/power.h index b5a4c33e1eae..297ee19a4c73 100644 --- a/src/soc/samsung/exynos5250/include/soc/power.h +++ b/src/soc/samsung/exynos5250/include/soc/power.h @@ -18,7 +18,6 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_POWER_H #define CPU_SAMSUNG_EXYNOS5250_POWER_H -#include <compiler.h> #include <soc/cpu.h> /* Enable HW thermal trip with PS_HOLD_CONTROL register ENABLE_HW_TRIP bit */ diff --git a/src/soc/samsung/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c index dd5ffd20d03a..cef9f5d150a8 100644 --- a/src/soc/samsung/exynos5420/i2c.c +++ b/src/soc/samsung/exynos5420/i2c.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <arch/io.h> #include <assert.h> #include <console/console.h> diff --git a/src/soc/samsung/exynos5420/include/soc/dmc.h b/src/soc/samsung/exynos5420/include/soc/dmc.h index b19b6609364f..e068255f96e7 100644 --- a/src/soc/samsung/exynos5420/include/soc/dmc.h +++ b/src/soc/samsung/exynos5420/include/soc/dmc.h @@ -14,8 +14,6 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_DMC_H #define CPU_SAMSUNG_EXYNOS5420_DMC_H -#include <compiler.h> - #define DMC_INTERLEAVE_SIZE 0x1f #define PAD_RETENTION_DRAM_COREBLK_VAL 0x10000000 diff --git a/src/soc/samsung/exynos5420/include/soc/power.h b/src/soc/samsung/exynos5420/include/soc/power.h index c5709a55e9c6..9b56fe5b1edf 100644 --- a/src/soc/samsung/exynos5420/include/soc/power.h +++ b/src/soc/samsung/exynos5420/include/soc/power.h @@ -18,7 +18,6 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_POWER_H #define CPU_SAMSUNG_EXYNOS5420_POWER_H -#include <compiler.h> #include <soc/cpu.h> /* Enable HW thermal trip with PS_HOLD_CONTROL register ENABLE_HW_TRIP bit */ diff --git a/src/southbridge/amd/sb700/sata.c b/src/southbridge/amd/sb700/sata.c index 6caffee9b505..1d1ac13890c1 100644 --- a/src/southbridge/amd/sb700/sata.c +++ b/src/southbridge/amd/sb700/sata.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> #include <console/console.h> #include <device/device.h> #include <delay.h> diff --git a/src/southbridge/intel/bd82x6x/me.h b/src/southbridge/intel/bd82x6x/me.h index b0f2a6e90b64..270886485d49 100644 --- a/src/southbridge/intel/bd82x6x/me.h +++ b/src/southbridge/intel/bd82x6x/me.h @@ -17,8 +17,6 @@ #ifndef _INTEL_ME_H #define _INTEL_ME_H -#include <compiler.h> - #define ME_RETRY 100000 /* 1 second */ #define ME_DELAY 10 /* 10 us */ diff --git a/src/southbridge/intel/bd82x6x/nvs.h b/src/southbridge/intel/bd82x6x/nvs.h index 537139dde15a..655851105ec5 100644 --- a/src/southbridge/intel/bd82x6x/nvs.h +++ b/src/southbridge/intel/bd82x6x/nvs.h @@ -15,7 +15,6 @@ */ #include <commonlib/helpers.h> -#include <compiler.h> #include <stdint.h> #include "vendorcode/google/chromeos/gnvs.h" diff --git a/src/southbridge/intel/common/gpio.h b/src/southbridge/intel/common/gpio.h index 97b778340042..019009ef18a1 100644 --- a/src/southbridge/intel/common/gpio.h +++ b/src/southbridge/intel/common/gpio.h @@ -17,7 +17,6 @@ #define INTEL_COMMON_GPIO_H #include <stdint.h> -#include <compiler.h> /* ICH7 GPIOBASE */ #define GPIO_USE_SEL 0x00 diff --git a/src/southbridge/intel/common/smihandler.c b/src/southbridge/intel/common/smihandler.c index 0fd8ab0506c4..8dce9bb12937 100644 --- a/src/southbridge/intel/common/smihandler.c +++ b/src/southbridge/intel/common/smihandler.c @@ -17,7 +17,6 @@ #include <types.h> #include <arch/io.h> #include <arch/acpi.h> -#include <compiler.h> #include <console/console.h> #include <cpu/x86/cache.h> #include <device/pci_def.h> diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index 180a629e32e0..31cdb3391da6 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -19,7 +19,6 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <compiler.h> #include <bootstate.h> #include <commonlib/helpers.h> #include <delay.h> diff --git a/src/southbridge/intel/fsp_bd82x6x/gpio.h b/src/southbridge/intel/fsp_bd82x6x/gpio.h index 3279be8ee5e3..a46a8fee333d 100644 --- a/src/southbridge/intel/fsp_bd82x6x/gpio.h +++ b/src/southbridge/intel/fsp_bd82x6x/gpio.h @@ -17,8 +17,6 @@ #ifndef INTEL_BD82X6X_GPIO_H #define INTEL_BD82X6X_GPIO_H -#include <compiler.h> - #define GPIO_MODE_NATIVE 0 #define GPIO_MODE_GPIO 1 #define GPIO_MODE_NONE 1 diff --git a/src/southbridge/intel/fsp_bd82x6x/me.h b/src/southbridge/intel/fsp_bd82x6x/me.h index b0f2a6e90b64..270886485d49 100644 --- a/src/southbridge/intel/fsp_bd82x6x/me.h +++ b/src/southbridge/intel/fsp_bd82x6x/me.h @@ -17,8 +17,6 @@ #ifndef _INTEL_ME_H #define _INTEL_ME_H -#include <compiler.h> - #define ME_RETRY 100000 /* 1 second */ #define ME_DELAY 10 /* 10 us */ diff --git a/src/southbridge/intel/fsp_bd82x6x/nvs.h b/src/southbridge/intel/fsp_bd82x6x/nvs.h index c8af5b989a6b..6d51ec114b70 100644 --- a/src/southbridge/intel/fsp_bd82x6x/nvs.h +++ b/src/southbridge/intel/fsp_bd82x6x/nvs.h @@ -15,7 +15,6 @@ */ #include <commonlib/helpers.h> -#include <compiler.h> #include "vendorcode/google/chromeos/gnvs.h" typedef struct global_nvs_t { diff --git a/src/southbridge/intel/fsp_i89xx/gpio.h b/src/southbridge/intel/fsp_i89xx/gpio.h index b89ab3ed3757..95cf70a78a8c 100644 --- a/src/southbridge/intel/fsp_i89xx/gpio.h +++ b/src/southbridge/intel/fsp_i89xx/gpio.h @@ -17,8 +17,6 @@ #ifndef INTEL_I89XX_GPIO_H #define INTEL_I89XX_GPIO_H -#include <compiler.h> - #define GPIO_MODE_NATIVE 0 #define GPIO_MODE_GPIO 1 #define GPIO_MODE_NONE 1 diff --git a/src/southbridge/intel/fsp_i89xx/me.h b/src/southbridge/intel/fsp_i89xx/me.h index b0f2a6e90b64..270886485d49 100644 --- a/src/southbridge/intel/fsp_i89xx/me.h +++ b/src/southbridge/intel/fsp_i89xx/me.h @@ -17,8 +17,6 @@ #ifndef _INTEL_ME_H #define _INTEL_ME_H -#include <compiler.h> - #define ME_RETRY 100000 /* 1 second */ #define ME_DELAY 10 /* 10 us */ diff --git a/src/southbridge/intel/fsp_i89xx/nvs.h b/src/southbridge/intel/fsp_i89xx/nvs.h index c8af5b989a6b..6d51ec114b70 100644 --- a/src/southbridge/intel/fsp_i89xx/nvs.h +++ b/src/southbridge/intel/fsp_i89xx/nvs.h @@ -15,7 +15,6 @@ */ #include <commonlib/helpers.h> -#include <compiler.h> #include "vendorcode/google/chromeos/gnvs.h" typedef struct global_nvs_t { diff --git a/src/southbridge/intel/fsp_rangeley/gpio.h b/src/southbridge/intel/fsp_rangeley/gpio.h index d8fbcb985da8..1a916f4dcc35 100644 --- a/src/southbridge/intel/fsp_rangeley/gpio.h +++ b/src/southbridge/intel/fsp_rangeley/gpio.h @@ -17,8 +17,6 @@ #ifndef INTEL_RANGELEY_GPIO_H #define INTEL_RANGELEY_GPIO_H -#include <compiler.h> - #define GPIO_MODE_NATIVE 0 #define GPIO_MODE_GPIO 1 #define GPIO_MODE_NONE 1 diff --git a/src/southbridge/intel/fsp_rangeley/nvs.h b/src/southbridge/intel/fsp_rangeley/nvs.h index fd3329051d09..12de76999d3f 100644 --- a/src/southbridge/intel/fsp_rangeley/nvs.h +++ b/src/southbridge/intel/fsp_rangeley/nvs.h @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> - typedef struct { /* Miscellaneous */ u16 osys; /* 0x00 - Operating System */ diff --git a/src/southbridge/intel/fsp_rangeley/spi.c b/src/southbridge/intel/fsp_rangeley/spi.c index 0512bcf19fd8..98ae708070c3 100644 --- a/src/southbridge/intel/fsp_rangeley/spi.c +++ b/src/southbridge/intel/fsp_rangeley/spi.c @@ -17,7 +17,6 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <compiler.h> #include <commonlib/helpers.h> #include <delay.h> #include <arch/io.h> diff --git a/src/southbridge/intel/i82801dx/nvs.h b/src/southbridge/intel/i82801dx/nvs.h index bdc6b45a56c5..3a72f4d7e9fe 100644 --- a/src/southbridge/intel/i82801dx/nvs.h +++ b/src/southbridge/intel/i82801dx/nvs.h @@ -13,8 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> - typedef struct { /* Miscellaneous */ u16 osys; /* 0x00 - Operating System */ diff --git a/src/southbridge/intel/i82801gx/nvs.h b/src/southbridge/intel/i82801gx/nvs.h index 483eddb4207d..04e62db809fe 100644 --- a/src/southbridge/intel/i82801gx/nvs.h +++ b/src/southbridge/intel/i82801gx/nvs.h @@ -13,8 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> - typedef struct { /* Miscellaneous */ u16 osys; /* 0x00 - Operating System */ diff --git a/src/southbridge/intel/i82801ix/nvs.h b/src/southbridge/intel/i82801ix/nvs.h index 483eddb4207d..04e62db809fe 100644 --- a/src/southbridge/intel/i82801ix/nvs.h +++ b/src/southbridge/intel/i82801ix/nvs.h @@ -13,8 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> - typedef struct { /* Miscellaneous */ u16 osys; /* 0x00 - Operating System */ diff --git a/src/southbridge/intel/i82801jx/nvs.h b/src/southbridge/intel/i82801jx/nvs.h index 16c49bb18b5b..ca66985746ec 100644 --- a/src/southbridge/intel/i82801jx/nvs.h +++ b/src/southbridge/intel/i82801jx/nvs.h @@ -13,8 +13,6 @@ * GNU General Public License for more details. */ -#include <compiler.h> - typedef struct { /* Miscellaneous */ u16 osys; /* 0x00 - Operating System */ diff --git a/src/southbridge/intel/ibexpeak/me.h b/src/southbridge/intel/ibexpeak/me.h index 6423d8d29de3..be65cc545490 100644 --- a/src/southbridge/intel/ibexpeak/me.h +++ b/src/southbridge/intel/ibexpeak/me.h @@ -17,8 +17,6 @@ #ifndef _INTEL_ME_H #define _INTEL_ME_H -#include <compiler.h> - #define ME_RETRY 100000 /* 1 second */ #define ME_DELAY 10 /* 10 us */ diff --git a/src/southbridge/intel/ibexpeak/nvs.h b/src/southbridge/intel/ibexpeak/nvs.h index 7b9fd249fc4e..36db12c043d6 100644 --- a/src/southbridge/intel/ibexpeak/nvs.h +++ b/src/southbridge/intel/ibexpeak/nvs.h @@ -15,7 +15,6 @@ */ #include <commonlib/helpers.h> -#include <compiler.h> #include "vendorcode/google/chromeos/gnvs.h" typedef struct global_nvs_t { diff --git a/src/southbridge/intel/lynxpoint/lp_gpio.h b/src/southbridge/intel/lynxpoint/lp_gpio.h index 6c21db228e74..fa6d700fd96b 100644 --- a/src/southbridge/intel/lynxpoint/lp_gpio.h +++ b/src/southbridge/intel/lynxpoint/lp_gpio.h @@ -16,8 +16,6 @@ #ifndef INTEL_LYNXPOINT_LP_GPIO_H #define INTEL_LYNXPOINT_LP_GPIO_H -#include <compiler.h> - /* LynxPoint LP GPIOBASE Registers */ #define GPIO_OWNER(set) (0x00 + ((set) * 4)) #define GPIO_PIRQ_APIC_EN 0x10 diff --git a/src/southbridge/intel/lynxpoint/me.h b/src/southbridge/intel/lynxpoint/me.h index cef2e55a2490..775b4eced6d7 100644 --- a/src/southbridge/intel/lynxpoint/me.h +++ b/src/southbridge/intel/lynxpoint/me.h @@ -17,8 +17,6 @@ #ifndef _INTEL_ME_H #define _INTEL_ME_H -#include <compiler.h> - #define ME_RETRY 100000 /* 1 second */ #define ME_DELAY 10 /* 10 us */ diff --git a/src/southbridge/intel/lynxpoint/nvs.h b/src/southbridge/intel/lynxpoint/nvs.h index fd0d8bc961d7..397cdf228976 100644 --- a/src/southbridge/intel/lynxpoint/nvs.h +++ b/src/southbridge/intel/lynxpoint/nvs.h @@ -15,7 +15,6 @@ */ #include <commonlib/helpers.h> -#include <compiler.h> #include "vendorcode/google/chromeos/gnvs.h" typedef struct global_nvs_t { diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.h b/src/southbridge/ricoh/rl5c476/rl5c476.h index 0639fd1193f9..646650a42af4 100644 --- a/src/southbridge/ricoh/rl5c476/rl5c476.h +++ b/src/southbridge/ricoh/rl5c476/rl5c476.h @@ -17,7 +17,6 @@ /* rl5c476 routines and defines*/ -#include <compiler.h> #include <stdint.h> diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc index 61d04807859a..0e6f2afd1c2b 100644 --- a/src/vendorcode/amd/pi/00670F00/Makefile.inc +++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc @@ -79,6 +79,7 @@ $(call src-to-obj,libagesa,$1): $(agesa_src_path)/$(notdir $1) $(obj)/config.h $ $(AGESA_INC) \ -include $(src)/include/rules.h \ -include $(src)/include/kconfig.h \ + -include $(src)/commonlib/include/commonlib/compiler.h \ -o $$@ \ $(agesa_src_path)/$(notdir $1) diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc index 19fd5d09a9f6..4c8db6ab5038 100644 --- a/src/vendorcode/amd/pi/Makefile.inc +++ b/src/vendorcode/amd/pi/Makefile.inc @@ -100,7 +100,9 @@ $(call src-to-obj,libagesa,$1): $(agesa_src_path)/$(notdir $1) $(obj)/config.h $ @printf " CC $$(subst $(obj)/,,$$(@))\n" $(CC_libagesa) -c -MMD $(CFLAGS_libagesa) $(AGESA_CFLAGS) \ $(AGESA_INC) \ - -include $(src)/include/rules.h -include $(src)/include/kconfig.h \ + -include $(src)/include/rules.h \ + -include $(src)/include/kconfig.h \ + -include $(src)/commonlib/include/commonlib/compiler.h \ -o $$@ \ $(agesa_src_path)/$(notdir $1) diff --git a/src/vendorcode/google/chromeos/gnvs.h b/src/vendorcode/google/chromeos/gnvs.h index 77c2f0aab887..7e97bfaa7531 100644 --- a/src/vendorcode/google/chromeos/gnvs.h +++ b/src/vendorcode/google/chromeos/gnvs.h @@ -16,8 +16,6 @@ #ifndef __VENDORCODE_GOOGLE_CHROMEOS_GNVS_H #define __VENDORCODE_GOOGLE_CHROMEOS_GNVS_H -#include <compiler.h> - #define BOOT_REASON_OTHER 0 #define BOOT_REASON_S3DIAG 9 diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 8e4d8b6f4edf..1787eb14c02d 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -80,6 +80,7 @@ TOOLCPPFLAGS += -I$(top)/util/cbfstool/flashmap TOOLCPPFLAGS += -I$(top)/util/cbfstool TOOLCPPFLAGS += -I$(objutil)/cbfstool TOOLCPPFLAGS += -I$(top)/src/commonlib/include +TOOLCPPFLAGS += -include $(top)/src/commonlib/include/commonlib/compiler.h TOOLCPPFLAGS += -DNEED_VB2_SHA_LIBRARY TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/include TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/2lib/include @@ -131,7 +132,7 @@ $(objutil)/cbfstool/%.o: $(top)/src/commonlib/%.c $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lz4/lib/%.c printf " HOSTCC $(subst $(objutil)/,,$(@))\n" - $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -include $(top)/util/cbfstool/compiler.h -c -o $@ $< + $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $< $(objutil)/cbfstool/cbfstool: $(addprefix $(objutil)/cbfstool/,$(cbfsobj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index fd2457a5732d..b082d8c7832f 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -18,7 +18,6 @@ #include "common.h" #include <stdint.h> -#include <compiler.h> #include <vb2_api.h> diff --git a/util/cbfstool/compiler.h b/util/cbfstool/compiler.h deleted file mode 100644 index cf043d5893a4..000000000000 --- a/util/cbfstool/compiler.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2017 Google Inc. - * Copyright (c) 2017-2018 Eltan B.V. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __COMPILER_H__ -#define __COMPILER_H__ - -#if !defined(__FreeBSD__) - -#if !defined(__packed) -#if defined(__WIN32) || defined(__WIN64) -#define __packed __attribute__((gcc_struct, packed)) -#else -#define __packed __attribute__((packed)) -#endif -#endif - -#if !defined(__aligned) -#define __aligned(x) __attribute__((aligned(x))) -#endif -#endif - -#define __always_unused __attribute__((unused)) -#define __must_check __attribute__((warn_unused_result)) - -#endif diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c index ad9ab37855f4..aeb1755032a8 100644 --- a/util/cbfstool/fit.c +++ b/util/cbfstool/fit.c @@ -17,7 +17,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <compiler.h> #include "fit.h" diff --git a/util/cbfstool/flashmap/fmap.h b/util/cbfstool/flashmap/fmap.h index 017d332ef96b..6e2091fc4f34 100644 --- a/util/cbfstool/flashmap/fmap.h +++ b/util/cbfstool/flashmap/fmap.h @@ -37,7 +37,6 @@ #define FLASHMAP_LIB_FMAP_H__ #include <inttypes.h> -#include <compiler.h> #include <valstr.h> #define FMAP_SIGNATURE "__FMAP__" diff --git a/util/cbfstool/ifwitool.c b/util/cbfstool/ifwitool.c index c427339a489c..1fbb61bfac29 100644 --- a/util/cbfstool/ifwitool.c +++ b/util/cbfstool/ifwitool.c @@ -17,7 +17,6 @@ #include <getopt.h> #include <stdlib.h> #include <time.h> -#include <compiler.h> #include "common.h" diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile index 694cac7110a1..9e403a641401 100644 --- a/util/cbmem/Makefile +++ b/util/cbmem/Makefile @@ -21,6 +21,7 @@ PREFIX ?= /usr/local CFLAGS ?= -O2 CFLAGS += -Wall -Werror CPPFLAGS += -I . -I $(ROOT)/commonlib/include +CPPFLAGS += -include ../../src/commonlib/include/commonlib/compiler.h OBJS = $(PROGRAM).o diff --git a/util/cbmem/compiler.h b/util/cbmem/compiler.h deleted file mode 100644 index fc6a36b65056..000000000000 --- a/util/cbmem/compiler.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2017 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __COMPILER_H__ -#define __COMPILER_H__ - -#if !defined(__FreeBSD__) - -#if defined(__WIN32) || defined(__WIN64) -#define __packed __attribute__((gcc_struct, packed)) -#else -#define __packed __attribute__((packed)) -#endif - -#define __aligned(x) __attribute__((aligned(x))) -#endif - -#define __always_unused __attribute__((unused)) -#define __must_check __attribute__((warn_unused_result)) - -#endif |