From 4ad1446b8333b258110d275c58d17b2d9ebbfa23 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Sat, 16 Jun 2018 18:29:33 +0200
Subject: src/mb: Fix non-local header treated as local

Also remove some unnedded includes.

Change-Id: I036208a111d009620d8354fa9c97688eb4e872ad
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/27129
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/mainboard/lenovo/s230u/romstage.c   | 11 +++--------
 src/mainboard/lenovo/t400/acpi_tables.c |  4 +---
 src/mainboard/lenovo/t400/dock.c        |  2 +-
 src/mainboard/lenovo/t60/dock.c         |  3 +--
 src/mainboard/lenovo/t60/smihandler.c   |  4 ++--
 src/mainboard/lenovo/x200/acpi_tables.c |  3 +--
 src/mainboard/lenovo/x200/dock.c        |  2 +-
 src/mainboard/lenovo/x201/dock.c        |  2 +-
 src/mainboard/lenovo/x201/smihandler.c  |  6 +++---
 src/mainboard/lenovo/x60/dock.c         |  2 +-
 src/mainboard/lenovo/x60/smihandler.c   |  4 ++--
 src/mainboard/lenovo/z61t/dock.c        |  3 +--
 src/mainboard/lenovo/z61t/smihandler.c  |  4 ++--
 13 files changed, 20 insertions(+), 30 deletions(-)

(limited to 'src/mainboard/lenovo')

diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/romstage.c
index b83eeaec73..7e002d4715 100644
--- a/src/mainboard/lenovo/s230u/romstage.c
+++ b/src/mainboard/lenovo/s230u/romstage.c
@@ -17,20 +17,15 @@
 #include <string.h>
 #include <cbfs.h>
 #include <lib.h>
-#include <timestamp.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
-#include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <console/console.h>
-#include "northbridge/intel/sandybridge/sandybridge.h"
-#include "northbridge/intel/sandybridge/raminit_native.h"
-#include "southbridge/intel/bd82x6x/pch.h"
+#include <northbridge/intel/sandybridge/sandybridge.h>
+#include <northbridge/intel/sandybridge/raminit_native.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
-#include <arch/cpu.h>
-#include <cpu/x86/msr.h>
 #include "ec.h"
 
 #define SPD_LEN 256
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index feced93a3f..2893d398f3 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -15,7 +15,6 @@
  */
 
 #include <string.h>
-#include <console/console.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
@@ -24,8 +23,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-
-#include "southbridge/intel/i82801ix/nvs.h"
+#include <southbridge/intel/i82801ix/nvs.h>
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
diff --git a/src/mainboard/lenovo/t400/dock.c b/src/mainboard/lenovo/t400/dock.c
index 74711e1227..0c6db0b5a1 100644
--- a/src/mainboard/lenovo/t400/dock.c
+++ b/src/mainboard/lenovo/t400/dock.c
@@ -25,7 +25,7 @@
 #include "dock.h"
 #include <superio/nsc/pc87382/pc87382.h>
 
-#include "southbridge/intel/i82801ix/i82801ix.h"
+#include <southbridge/intel/i82801ix/i82801ix.h>
 #include "ec/lenovo/h8/h8.h"
 #include <ec/acpi/ec.h>
 
diff --git a/src/mainboard/lenovo/t60/dock.c b/src/mainboard/lenovo/t60/dock.c
index 0e24b95c24..05dd65ef3e 100644
--- a/src/mainboard/lenovo/t60/dock.c
+++ b/src/mainboard/lenovo/t60/dock.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <arch/io.h>
 #include <delay.h>
@@ -22,7 +21,7 @@
 #include <superio/nsc/pc87384/pc87384.h>
 #include "ec/acpi/ec.h"
 #include "ec/lenovo/pmh7/pmh7.h"
-#include "southbridge/intel/i82801gx/i82801gx.h"
+#include <southbridge/intel/i82801gx/i82801gx.h>
 
 #define DLPC_CONTROL 0x164c
 
diff --git a/src/mainboard/lenovo/t60/smihandler.c b/src/mainboard/lenovo/t60/smihandler.c
index efb0ac43e9..7707d624c8 100644
--- a/src/mainboard/lenovo/t60/smihandler.c
+++ b/src/mainboard/lenovo/t60/smihandler.c
@@ -17,8 +17,8 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "southbridge/intel/i82801gx/nvs.h"
-#include "southbridge/intel/i82801gx/i82801gx.h"
+#include <southbridge/intel/i82801gx/nvs.h>
+#include <southbridge/intel/i82801gx/i82801gx.h>
 #include <ec/acpi/ec.h>
 #include "dock.h"
 #include "smi.h"
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 43a0fc8c83..2893d398f3 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -15,7 +15,6 @@
  */
 
 #include <string.h>
-#include <console/console.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
@@ -24,8 +23,8 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
+#include <southbridge/intel/i82801ix/nvs.h>
 
-#include "southbridge/intel/i82801ix/nvs.h"
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	memset((void *)gnvs, 0, sizeof(*gnvs));
diff --git a/src/mainboard/lenovo/x200/dock.c b/src/mainboard/lenovo/x200/dock.c
index 836ff35c07..5bf2cd3ee6 100644
--- a/src/mainboard/lenovo/x200/dock.c
+++ b/src/mainboard/lenovo/x200/dock.c
@@ -22,7 +22,7 @@
 #include <device/pci.h>
 #include <delay.h>
 #include "dock.h"
-#include "southbridge/intel/i82801ix/i82801ix.h"
+#include <southbridge/intel/i82801ix/i82801ix.h>
 #include "ec/lenovo/h8/h8.h"
 #include <ec/acpi/ec.h>
 
diff --git a/src/mainboard/lenovo/x201/dock.c b/src/mainboard/lenovo/x201/dock.c
index 1941ac60f8..a11c7202bd 100644
--- a/src/mainboard/lenovo/x201/dock.c
+++ b/src/mainboard/lenovo/x201/dock.c
@@ -22,7 +22,7 @@
 #include <device/pci.h>
 #include <delay.h>
 #include "dock.h"
-#include "southbridge/intel/ibexpeak/pch.h"
+#include <southbridge/intel/ibexpeak/pch.h>
 #include "ec/lenovo/h8/h8.h"
 #include <ec/acpi/ec.h>
 
diff --git a/src/mainboard/lenovo/x201/smihandler.c b/src/mainboard/lenovo/x201/smihandler.c
index f00ae0dcdc..93cc2b73dc 100644
--- a/src/mainboard/lenovo/x201/smihandler.c
+++ b/src/mainboard/lenovo/x201/smihandler.c
@@ -17,9 +17,9 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "southbridge/intel/ibexpeak/nvs.h"
-#include "southbridge/intel/ibexpeak/pch.h"
-#include "southbridge/intel/ibexpeak/me.h"
+#include <southbridge/intel/ibexpeak/nvs.h>
+#include <southbridge/intel/ibexpeak/pch.h>
+#include <southbridge/intel/ibexpeak/me.h>
 #include <northbridge/intel/nehalem/nehalem.h>
 #include <cpu/intel/model_2065x/model_2065x.h>
 #include <ec/acpi/ec.h>
diff --git a/src/mainboard/lenovo/x60/dock.c b/src/mainboard/lenovo/x60/dock.c
index c2bed9a087..5b49498a84 100644
--- a/src/mainboard/lenovo/x60/dock.c
+++ b/src/mainboard/lenovo/x60/dock.c
@@ -20,7 +20,7 @@
 #include <delay.h>
 #include <arch/io.h>
 #include "dock.h"
-#include "southbridge/intel/i82801gx/i82801gx.h"
+#include <southbridge/intel/i82801gx/i82801gx.h>
 #include <superio/nsc/pc87392/pc87392.h>
 
 static void dlpc_write_register(int reg, int value)
diff --git a/src/mainboard/lenovo/x60/smihandler.c b/src/mainboard/lenovo/x60/smihandler.c
index b9f0a577a0..c66474dcc8 100644
--- a/src/mainboard/lenovo/x60/smihandler.c
+++ b/src/mainboard/lenovo/x60/smihandler.c
@@ -17,8 +17,8 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "southbridge/intel/i82801gx/nvs.h"
-#include "southbridge/intel/i82801gx/i82801gx.h"
+#include <southbridge/intel/i82801gx/nvs.h>
+#include <southbridge/intel/i82801gx/i82801gx.h>
 #include <ec/acpi/ec.h>
 #include <pc80/mc146818rtc.h>
 #include <ec/lenovo/h8/h8.h>
diff --git a/src/mainboard/lenovo/z61t/dock.c b/src/mainboard/lenovo/z61t/dock.c
index 0e24b95c24..05dd65ef3e 100644
--- a/src/mainboard/lenovo/z61t/dock.c
+++ b/src/mainboard/lenovo/z61t/dock.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <arch/io.h>
 #include <delay.h>
@@ -22,7 +21,7 @@
 #include <superio/nsc/pc87384/pc87384.h>
 #include "ec/acpi/ec.h"
 #include "ec/lenovo/pmh7/pmh7.h"
-#include "southbridge/intel/i82801gx/i82801gx.h"
+#include <southbridge/intel/i82801gx/i82801gx.h>
 
 #define DLPC_CONTROL 0x164c
 
diff --git a/src/mainboard/lenovo/z61t/smihandler.c b/src/mainboard/lenovo/z61t/smihandler.c
index ef5cfc64a2..d98a80957b 100644
--- a/src/mainboard/lenovo/z61t/smihandler.c
+++ b/src/mainboard/lenovo/z61t/smihandler.c
@@ -17,8 +17,8 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "southbridge/intel/i82801gx/nvs.h"
-#include "southbridge/intel/i82801gx/i82801gx.h"
+#include <southbridge/intel/i82801gx/nvs.h>
+#include <southbridge/intel/i82801gx/i82801gx.h>
 #include <ec/acpi/ec.h>
 #include "dock.h"
 #include "smi.h"
-- 
cgit v1.2.3