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/baytrail/gpio.c                    | 1 -
 src/soc/intel/baytrail/include/soc/device_nvs.h  | 1 -
 src/soc/intel/baytrail/include/soc/efi_wrapper.h | 2 --
 src/soc/intel/baytrail/include/soc/gpio.h        | 1 -
 src/soc/intel/baytrail/include/soc/mrc_wrapper.h | 2 --
 src/soc/intel/baytrail/include/soc/nvs.h         | 1 -
 src/soc/intel/baytrail/include/soc/pmc.h         | 1 -
 src/soc/intel/baytrail/southcluster.c            | 1 -
 src/soc/intel/baytrail/spi.c                     | 1 -
 9 files changed, 11 deletions(-)

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

diff --git a/src/soc/intel/baytrail/gpio.c b/src/soc/intel/baytrail/gpio.c
index 451993df2f..743ab9fbef 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 bc6f7ec5de..74e312a858 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 3425aae823..d362494638 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 93e80cbab2..474aaea314 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 d3547c2fb2..d7f4483820 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 715929d7ea..08ccbf44ff 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 c287d9cea9..bc8e877697 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 83f4227bff..0ef70d020b 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 c42b398594..d81b878e51 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>
-- 
cgit v1.2.3