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/soc/intel/broadwell/include/soc/device_nvs.h | 1 -
 src/soc/intel/broadwell/include/soc/gpio.h       | 1 -
 src/soc/intel/broadwell/include/soc/me.h         | 1 -
 src/soc/intel/broadwell/include/soc/nvs.h        | 1 -
 src/soc/intel/broadwell/include/soc/pei_data.h   | 1 -
 src/soc/intel/broadwell/include/soc/smm.h        | 1 -
 6 files changed, 6 deletions(-)

(limited to 'src/soc/intel/broadwell/include')

diff --git a/src/soc/intel/broadwell/include/soc/device_nvs.h b/src/soc/intel/broadwell/include/soc/device_nvs.h
index d17b3d461e..c37816cfba 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 d5ff7bb295..66820b2184 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 34b44816e8..a213e37047 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 2e51e1bd20..63c7bde23b 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 d12011e797..989ca06733 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 9a749c9051..75e78337c2 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 {
-- 
cgit v1.2.3