From d44221f9c8f3686e040ff9481829315068b321a3 Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.h@gmx.de>
Date: Thu, 4 Oct 2018 23:42:42 +0200
Subject: 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>
---
 src/northbridge/amd/amdfam10/amdfam10.h         | 1 -
 src/northbridge/amd/amdmct/mct/mct_d.h          | 1 -
 src/northbridge/amd/lx/raminit.c                | 1 -
 src/northbridge/amd/pi/agesawrapper.c           | 1 -
 src/northbridge/intel/e7505/raminit.c           | 1 -
 src/northbridge/intel/haswell/haswell.h         | 1 -
 src/northbridge/intel/haswell/pei_data.h        | 2 --
 src/northbridge/intel/i945/raminit.h            | 2 --
 src/northbridge/intel/nehalem/raminit.c         | 1 -
 src/northbridge/intel/sandybridge/pei_data.h    | 2 --
 src/northbridge/intel/sandybridge/raminit.h     | 1 -
 src/northbridge/intel/sandybridge/raminit_mrc.c | 1 -
 12 files changed, 15 deletions(-)

(limited to 'src/northbridge')

diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index 5102b0bb30..f16ef8325b 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 6a69cfae8c..5d31d44428 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 55dcefde62..8de85a346e 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 d083883eb3..3021b81358 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 4919e65ae5..5dcc1faf85 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 d8868a1016..3099a59024 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 f4023e0a6b..319b9e76f0 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 7d8555774e..98bdc02afd 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 490fd09003..33f9c4869e 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 41fc33fd9a..00534ca9a7 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 66a94f48d8..4bc9de610e 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 39b540ca16..0c3751f57e 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>
-- 
cgit v1.2.3