From 0b6bb6990417863010258632374c3f5ac19350c9 Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Mon, 20 Oct 2014 14:21:22 -0700
Subject: [PATCH] bg4cd: Change all SoC headers to <soc/headername.h> system

This patch aligns bg4cd to the new SoC header include scheme.
Also alphabetized headers in affected files since we touch them anyway.

BUG=None
TEST=Tested with whole series. Compiled Cosmos.

Change-Id: Ia5299659ad186f2e7d698adfa7562396e747473f
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/224506
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/mainboard/google/cosmos/memlayout.ld      |  2 +-
 src/mainboard/google/cosmos/romstage.c        | 21 ++++++++++---------
 src/soc/marvell/bg4cd/Makefile.inc            |  2 ++
 src/soc/marvell/bg4cd/i2c.c                   |  2 +-
 src/soc/marvell/bg4cd/{ => include/soc}/i2c.h |  0
 .../bg4cd/{ => include/soc}/memlayout.ld      |  0
 .../marvell/bg4cd/{ => include/soc}/sdram.h   |  0
 src/soc/marvell/bg4cd/sdram.c                 |  2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)
 rename src/soc/marvell/bg4cd/{ => include/soc}/i2c.h (100%)
 rename src/soc/marvell/bg4cd/{ => include/soc}/memlayout.ld (100%)
 rename src/soc/marvell/bg4cd/{ => include/soc}/sdram.h (100%)

diff --git a/src/mainboard/google/cosmos/memlayout.ld b/src/mainboard/google/cosmos/memlayout.ld
index d788b78602..ead7f47838 100644
--- a/src/mainboard/google/cosmos/memlayout.ld
+++ b/src/mainboard/google/cosmos/memlayout.ld
@@ -1 +1 @@
-#include <soc/marvell/bg4cd/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/cosmos/romstage.c b/src/mainboard/google/cosmos/romstage.c
index a78debeb0e..e80d3311a6 100644
--- a/src/mainboard/google/cosmos/romstage.c
+++ b/src/mainboard/google/cosmos/romstage.c
@@ -17,20 +17,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <types.h>
-#include <armv7.h>
-#include <cbfs.h>
-#include <console/console.h>
-#include <arch/stages.h>
-#include <cbmem.h>
-#include <delay.h>
-#include <timestamp.h>
 #include <arch/cache.h>
 #include <arch/exception.h>
+#include <arch/stages.h>
+#include <armv7.h>
+#include <cbfs.h>
+#include <cbmem.h>
+#include <console/console.h>
+#include <delay.h>
+#include <soc/sdram.h>
 #include <stdlib.h>
-#include <vendorcode/google/chromeos/chromeos.h>
-#include <soc/marvell/bg4cd/sdram.h>
 #include <symbols.h>
+#include <timestamp.h>
+#include <types.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
 #include "timer.h"
 
 void main(void)
diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc
index 0271fc75d5..2255cf3803 100644
--- a/src/soc/marvell/bg4cd/Makefile.inc
+++ b/src/soc/marvell/bg4cd/Makefile.inc
@@ -42,6 +42,8 @@ ramstage-y += monotonic_timer.c
 ramstage-$(CONFIG_SPI_FLASH) += spi.c
 ramstage-$(CONFIG_CONSOLE_SERIAL) += uart.c
 
+INCLUDES += -Isrc/soc/marvell/bg4cd/include/
+
 $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
 	cp $< $@
 
diff --git a/src/soc/marvell/bg4cd/i2c.c b/src/soc/marvell/bg4cd/i2c.c
index 1aa02d0689..16ad9abcf3 100644
--- a/src/soc/marvell/bg4cd/i2c.c
+++ b/src/soc/marvell/bg4cd/i2c.c
@@ -18,7 +18,7 @@
  */
 
 #include <device/i2c.h>
-#include "i2c.h"
+#include <soc/i2c.h>
 
 int platform_i2c_transfer(unsigned bus, struct i2c_seg *segments, int seg_count)
 {
diff --git a/src/soc/marvell/bg4cd/i2c.h b/src/soc/marvell/bg4cd/include/soc/i2c.h
similarity index 100%
rename from src/soc/marvell/bg4cd/i2c.h
rename to src/soc/marvell/bg4cd/include/soc/i2c.h
diff --git a/src/soc/marvell/bg4cd/memlayout.ld b/src/soc/marvell/bg4cd/include/soc/memlayout.ld
similarity index 100%
rename from src/soc/marvell/bg4cd/memlayout.ld
rename to src/soc/marvell/bg4cd/include/soc/memlayout.ld
diff --git a/src/soc/marvell/bg4cd/sdram.h b/src/soc/marvell/bg4cd/include/soc/sdram.h
similarity index 100%
rename from src/soc/marvell/bg4cd/sdram.h
rename to src/soc/marvell/bg4cd/include/soc/sdram.h
diff --git a/src/soc/marvell/bg4cd/sdram.c b/src/soc/marvell/bg4cd/sdram.c
index 1b5575b08e..0ebee151fb 100644
--- a/src/soc/marvell/bg4cd/sdram.c
+++ b/src/soc/marvell/bg4cd/sdram.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <console/console.h>
-#include "sdram.h"
+#include <soc/sdram.h>
 
 void sdram_init(void)
 {