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/drivers/intel/fsp2_0/graphics.c         | 1 -
 src/drivers/intel/fsp2_0/hob_display.c      | 1 -
 src/drivers/intel/fsp2_0/include/fsp/upd.h  | 2 --
 src/drivers/intel/fsp2_0/include/fsp/util.h | 1 -
 src/drivers/intel/fsp2_0/memory_init.c      | 1 -
 src/drivers/intel/fsp2_0/notify.c           | 1 -
 src/drivers/intel/fsp2_0/upd_display.c      | 1 -
 7 files changed, 8 deletions(-)

(limited to 'src/drivers/intel/fsp2_0')

diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c
index ae1442ee9d..e8514974d7 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 977facbfc6..24a340f344 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 580257bd8e..15094dfb10 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 e7778ec182..231162ed17 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 accb70ba91..dc37eaaf1b 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 6d6d623be4..2907ae25b1 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 415505e1dd..19803c4f2f 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>
-- 
cgit v1.2.3