From 241f8fcf1a496746200736f49ae9f8d067c00624 Mon Sep 17 00:00:00 2001
From: Duncan Laurie <dlaurie@chromium.org>
Date: Thu, 3 Sep 2015 16:10:48 -0700
Subject: glados: Change include headers to relative path

To make it easier to port glados to a new board name change
the include headers to use relative path name instead of
including the mainboard name.

BUG=chrome-os-partner:40635
BRANCH=none
TEST=emerge-glados coreboot

Change-Id: I6d184adab5b6b2df970ddd3998d3413f1330c12e
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 11dd6b73f298cf4867f4a089478132d5e543ea90
Original-Change-Id: Ia8de127fb176784acbbee975e8b950f8c9824c5c
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/297742
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11566
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/mainboard/google/glados/acpi/chromeos.asl  | 2 +-
 src/mainboard/google/glados/acpi/ec.asl        | 4 ++--
 src/mainboard/google/glados/acpi/mainboard.asl | 6 +++---
 src/mainboard/google/glados/acpi/superio.asl   | 2 +-
 src/mainboard/google/glados/chromeos.c         | 2 +-
 src/mainboard/google/glados/spd/spd.c          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/mainboard/google')

diff --git a/src/mainboard/google/glados/acpi/chromeos.asl b/src/mainboard/google/glados/acpi/chromeos.asl
index b8cef5ea91..6b16dbcbbd 100644
--- a/src/mainboard/google/glados/acpi/chromeos.asl
+++ b/src/mainboard/google/glados/acpi/chromeos.asl
@@ -17,7 +17,7 @@
  * Foundation, Inc.
  */
 
-#include <mainboard/google/glados/gpio.h>
+#include "../gpio.h"
 
 Name (OIPG, Package () {
 	/* No physical recovery GPIO. */
diff --git a/src/mainboard/google/glados/acpi/ec.asl b/src/mainboard/google/glados/acpi/ec.asl
index 33a7471a8c..d69ebe2d01 100644
--- a/src/mainboard/google/glados/acpi/ec.asl
+++ b/src/mainboard/google/glados/acpi/ec.asl
@@ -18,8 +18,8 @@
  */
 
 /* mainboard configuration */
-#include <mainboard/google/glados/ec.h>
-#include <mainboard/google/glados/gpio.h>
+#include "../ec.h"
+#include "../gpio.h"
 
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
diff --git a/src/mainboard/google/glados/acpi/mainboard.asl b/src/mainboard/google/glados/acpi/mainboard.asl
index efa7dddcf4..0184a6a6cf 100644
--- a/src/mainboard/google/glados/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/acpi/mainboard.asl
@@ -17,7 +17,7 @@
  * Foundation, Inc.
  */
 
-#include <mainboard/google/glados/gpio.h>
+#include "../gpio.h"
 
 #define BOARD_TOUCHPAD_I2C_ADDR			0x15
 #define BOARD_TOUCHPAD_IRQ			TOUCHPAD_INT_L
@@ -67,7 +67,7 @@ Scope (\_SB.PCI0.I2C0)
 		Name (_UID, 1)
 		Name (_S0W, 4)
 
-		Name (_CRS, ResourceTemplate()
+		Name (_CRS, ResourceTemplate ()
 		{
 			I2cSerialBus (
 				BOARD_TOUCHSCREEN_I2C_ADDR,
@@ -99,7 +99,7 @@ Scope (\_SB.PCI0.I2C1)
 		Name (_UID, 1)
 		Name (_S0W, 4)
 
-		Name (_CRS, ResourceTemplate()
+		Name (_CRS, ResourceTemplate ()
 		{
 			I2cSerialBus (
 				BOARD_TOUCHPAD_I2C_ADDR,
diff --git a/src/mainboard/google/glados/acpi/superio.asl b/src/mainboard/google/glados/acpi/superio.asl
index 932fef7430..822821e9df 100644
--- a/src/mainboard/google/glados/acpi/superio.asl
+++ b/src/mainboard/google/glados/acpi/superio.asl
@@ -18,7 +18,7 @@
  */
 
 /* mainboard configuration */
-#include <mainboard/google/glados/ec.h>
+#include "../ec.h"
 
 #define SIO_EC_MEMMAP_ENABLE     // EC Memory Map Resources
 #define SIO_EC_HOST_ENABLE       // EC Host Interface Resources
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index dba1cbbb7f..7d428089ee 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -28,8 +28,8 @@
 #include <string.h>
 #include <ec/google/chromeec/ec.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include <mainboard/google/glados/gpio.h>
 
+#include "gpio.h"
 #include "ec.h"
 
 #if ENV_RAMSTAGE
diff --git a/src/mainboard/google/glados/spd/spd.c b/src/mainboard/google/glados/spd/spd.c
index ad05b31ddf..fc9cb53b39 100644
--- a/src/mainboard/google/glados/spd/spd.c
+++ b/src/mainboard/google/glados/spd/spd.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <soc/pei_data.h>
 #include <soc/romstage.h>
-#include <mainboard/google/glados/gpio.h>
+#include "../gpio.h"
 #include "spd.h"
 
 static void mainboard_print_spd_info(uint8_t spd[])
-- 
cgit v1.2.3