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/nvidia/tegra124/include/soc/clk_rst.h  | 2 --
 src/soc/nvidia/tegra124/include/soc/dma.h      | 1 -
 src/soc/nvidia/tegra124/include/soc/emc.h      | 1 -
 src/soc/nvidia/tegra124/include/soc/spi.h      | 1 -
 src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c | 1 -
 src/soc/nvidia/tegra124/uart.c                 | 1 -
 src/soc/nvidia/tegra210/bootblock.c            | 1 -
 src/soc/nvidia/tegra210/funitcfg.c             | 1 -
 src/soc/nvidia/tegra210/include/soc/clk_rst.h  | 1 -
 src/soc/nvidia/tegra210/include/soc/clst_clk.h | 2 --
 src/soc/nvidia/tegra210/include/soc/dma.h      | 1 -
 src/soc/nvidia/tegra210/include/soc/emc.h      | 1 -
 src/soc/nvidia/tegra210/include/soc/spi.h      | 1 -
 src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c | 1 -
 src/soc/nvidia/tegra210/romstage.c             | 1 -
 src/soc/nvidia/tegra210/uart.c                 | 1 -
 16 files changed, 18 deletions(-)

(limited to 'src/soc/nvidia')

diff --git a/src/soc/nvidia/tegra124/include/soc/clk_rst.h b/src/soc/nvidia/tegra124/include/soc/clk_rst.h
index 7cac4ba319..07e710a9f3 100644
--- a/src/soc/nvidia/tegra124/include/soc/clk_rst.h
+++ b/src/soc/nvidia/tegra124/include/soc/clk_rst.h
@@ -16,8 +16,6 @@
 #ifndef _TEGRA124_CLK_RST_H_
 #define _TEGRA124_CLK_RST_H_
 
-#include <compiler.h>
-
 /* Clock/Reset Controller (CLK_RST_CONTROLLER_) regs */
 struct  __packed clk_rst_ctlr {
 	u32 rst_src;			/* _RST_SOURCE,             0x000 */
diff --git a/src/soc/nvidia/tegra124/include/soc/dma.h b/src/soc/nvidia/tegra124/include/soc/dma.h
index 4cb1dea616..42c70275f5 100644
--- a/src/soc/nvidia/tegra124/include/soc/dma.h
+++ b/src/soc/nvidia/tegra124/include/soc/dma.h
@@ -19,7 +19,6 @@
 #define __NVIDIA_TEGRA124_DMA_H__
 
 #include <inttypes.h>
-#include <compiler.h>
 #include <soc/addressmap.h>
 
 /*
diff --git a/src/soc/nvidia/tegra124/include/soc/emc.h b/src/soc/nvidia/tegra124/include/soc/emc.h
index 1311f9efa2..8e190f9358 100644
--- a/src/soc/nvidia/tegra124/include/soc/emc.h
+++ b/src/soc/nvidia/tegra124/include/soc/emc.h
@@ -19,7 +19,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <compiler.h>
 
 enum {
 	EMC_PIN_RESET_MASK = 1 << 8,
diff --git a/src/soc/nvidia/tegra124/include/soc/spi.h b/src/soc/nvidia/tegra124/include/soc/spi.h
index 80ced37689..875e88032a 100644
--- a/src/soc/nvidia/tegra124/include/soc/spi.h
+++ b/src/soc/nvidia/tegra124/include/soc/spi.h
@@ -19,7 +19,6 @@
 #include <spi-generic.h>
 #include <soc/dma.h>
 #include <stddef.h>
-#include <compiler.h>
 
 struct tegra_spi_regs {
 	u32 command1;		/* 0x000: SPI_COMMAND1 */
diff --git a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c
index a8b2e69ea0..7cc320405a 100644
--- a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c
+++ b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <compiler.h>
 
 /* Function unit addresses. */
 enum {
diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c
index 5cb8112d81..50c395658a 100644
--- a/src/soc/nvidia/tegra124/uart.c
+++ b/src/soc/nvidia/tegra124/uart.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <compiler.h>
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
 #include <console/console.h>	/* for __console definition */
diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c
index 4d1ddf5d60..353644710d 100644
--- a/src/soc/nvidia/tegra210/bootblock.c
+++ b/src/soc/nvidia/tegra210/bootblock.c
@@ -17,7 +17,6 @@
 #include <arch/hlt.h>
 #include <arch/stages.h>
 #include <bootblock_common.h>
-#include <compiler.h>
 #include <console/console.h>
 #include <delay.h>
 #include <program_loading.h>
diff --git a/src/soc/nvidia/tegra210/funitcfg.c b/src/soc/nvidia/tegra210/funitcfg.c
index e8d0c9754d..b4319d59d6 100644
--- a/src/soc/nvidia/tegra210/funitcfg.c
+++ b/src/soc/nvidia/tegra210/funitcfg.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <compiler.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/funitcfg.h>
diff --git a/src/soc/nvidia/tegra210/include/soc/clk_rst.h b/src/soc/nvidia/tegra210/include/soc/clk_rst.h
index 652bcaaf27..42eebedbc7 100644
--- a/src/soc/nvidia/tegra210/include/soc/clk_rst.h
+++ b/src/soc/nvidia/tegra210/include/soc/clk_rst.h
@@ -17,7 +17,6 @@
 #define _TEGRA210_CLK_RST_H_
 #include <stdint.h>
 #include <stddef.h>
-#include <compiler.h>
 
 /* Clock/Reset Controller (CLK_RST_CONTROLLER_) regs */
 struct  __packed clk_rst_ctlr {
diff --git a/src/soc/nvidia/tegra210/include/soc/clst_clk.h b/src/soc/nvidia/tegra210/include/soc/clst_clk.h
index 0b9b18dc06..661fd1d849 100644
--- a/src/soc/nvidia/tegra210/include/soc/clst_clk.h
+++ b/src/soc/nvidia/tegra210/include/soc/clst_clk.h
@@ -16,8 +16,6 @@
 #ifndef _TEGRA210_CLST_CLK_H_
 #define _TEGRA210_CLST_CLK_H_
 
-#include <compiler.h>
-
 /* Cluster Clock (CLUSTER_CLOCKS_PUBLIC_) regs */
 struct  __packed clst_clk_ctlr {
 	u32 pllx_base;			/* _PLLX_BASE,              0x000 */
diff --git a/src/soc/nvidia/tegra210/include/soc/dma.h b/src/soc/nvidia/tegra210/include/soc/dma.h
index f8bd92befd..1093479d5f 100644
--- a/src/soc/nvidia/tegra210/include/soc/dma.h
+++ b/src/soc/nvidia/tegra210/include/soc/dma.h
@@ -18,7 +18,6 @@
 #define __NVIDIA_TEGRA210_DMA_H__
 
 #include <inttypes.h>
-#include <compiler.h>
 #include <soc/addressmap.h>
 
 /*
diff --git a/src/soc/nvidia/tegra210/include/soc/emc.h b/src/soc/nvidia/tegra210/include/soc/emc.h
index 8ba23a0bb0..289aa72612 100644
--- a/src/soc/nvidia/tegra210/include/soc/emc.h
+++ b/src/soc/nvidia/tegra210/include/soc/emc.h
@@ -19,7 +19,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <compiler.h>
 
 enum {
 	EMC_PIN_RESET_MASK = 1 << 8,
diff --git a/src/soc/nvidia/tegra210/include/soc/spi.h b/src/soc/nvidia/tegra210/include/soc/spi.h
index 7508792d76..46c1c3c063 100644
--- a/src/soc/nvidia/tegra210/include/soc/spi.h
+++ b/src/soc/nvidia/tegra210/include/soc/spi.h
@@ -17,7 +17,6 @@
 #ifndef __NVIDIA_TEGRA210_SPI_H__
 #define __NVIDIA_TEGRA210_SPI_H__
 
-#include <compiler.h>
 #include <soc/dma.h>
 #include <spi-generic.h>
 #include <stddef.h>
diff --git a/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c b/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c
index 108b3b07de..51e75f5da9 100644
--- a/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c
+++ b/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <compiler.h>
 
 /* Function unit addresses. */
 enum {
diff --git a/src/soc/nvidia/tegra210/romstage.c b/src/soc/nvidia/tegra210/romstage.c
index 8958a6bb1e..07bf5d43f8 100644
--- a/src/soc/nvidia/tegra210/romstage.c
+++ b/src/soc/nvidia/tegra210/romstage.c
@@ -17,7 +17,6 @@
 #include <arch/stages.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <compiler.h>
 #include <console/cbmem_console.h>
 #include <console/console.h>
 #include <lib.h>
diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c
index 97dc740ebf..b7cec3d171 100644
--- a/src/soc/nvidia/tegra210/uart.c
+++ b/src/soc/nvidia/tegra210/uart.c
@@ -19,7 +19,6 @@
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 #include <stdint.h>
-#include <compiler.h>
 
 struct tegra210_uart {
 	union {
-- 
cgit v1.2.3