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/apollolake/chip.c            | 1 -
 src/soc/intel/apollolake/cse.c             | 1 -
 src/soc/intel/apollolake/include/soc/nvs.h | 1 -
 src/soc/intel/apollolake/include/soc/pm.h  | 1 -
 src/soc/intel/apollolake/romstage.c        | 2 --
 5 files changed, 6 deletions(-)

(limited to 'src/soc/intel/apollolake')

diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index ba10e35562..9ee6dbb96d 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 8842500fa8..9051dc3304 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 3250aeb277..6c37d5977b 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 6de39a068c..c4f1d1b39c 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 416877103c..995564d717 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] = {
-- 
cgit v1.2.3