From 1ed0c8c0b221962855b6f547cc663c506b9cb5c6 Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Mon, 20 Oct 2014 13:16:29 -0700
Subject: exynos5250: Change all SoC headers to <soc/headername.h> system

This patch aligns exynos5250 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 Daisy.

Change-Id: I39805c0346e117a0f9b2667763ecaa428f0f55a8
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: db6762f0c8425371d9860f908a5cefdeee8d1abc
Original-Change-Id: Ic358061ddcbbe7d83a95ca11247b8b505b20491d
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/224500
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9323
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/mainboard/google/daisy/chromeos.c   |  4 ++--
 src/mainboard/google/daisy/mainboard.c  | 28 +++++++++++++--------------
 src/mainboard/google/daisy/memlayout.ld |  2 +-
 src/mainboard/google/daisy/memory.c     | 11 +++++------
 src/mainboard/google/daisy/romstage.c   | 34 ++++++++++++++++-----------------
 src/mainboard/google/daisy/wakeup.c     |  4 ++--
 6 files changed, 40 insertions(+), 43 deletions(-)

(limited to 'src/mainboard/google')

diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c
index f7443becc7..9e67a4c127 100644
--- a/src/mainboard/google/daisy/chromeos.c
+++ b/src/mainboard/google/daisy/chromeos.c
@@ -21,11 +21,11 @@
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
+#include <soc/cpu.h>
+#include <soc/gpio.h>
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <bootmode.h>
-#include <soc/samsung/exynos5250/cpu.h>
-#include <soc/samsung/exynos5250/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index 138e498de8..e2ad5b0eb8 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -17,26 +17,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/cache.h>
+#include <boot/coreboot_tables.h>
 #include <console/console.h>
+#include <cbmem.h>
+#include <delay.h>
 #include <device/device.h>
 #include <device/i2c.h>
 #include <drivers/ti/tps65090/tps65090.h>
-#include <cbmem.h>
-#include <delay.h>
 #include <edid.h>
-#include <vbe.h>
-#include <boot/coreboot_tables.h>
-#include <arch/cache.h>
-#include <soc/samsung/exynos5250/tmu.h>
-#include <soc/samsung/exynos5250/clk.h>
-#include <soc/samsung/exynos5250/gpio.h>
-#include <soc/samsung/exynos5250/power.h>
-#include <soc/samsung/exynos5250/i2c.h>
-#include <soc/samsung/exynos5250/dp-core.h>
-#include <soc/samsung/exynos5250/dp.h>
-#include <soc/samsung/exynos5250/periph.h>
-#include <soc/samsung/exynos5250/usb.h>
+#include <soc/clk.h>
+#include <soc/dp.h>
+#include <soc/dp-core.h>
+#include <soc/gpio.h>
+#include <soc/i2c.h>
+#include <soc/periph.h>
+#include <soc/power.h>
+#include <soc/tmu.h>
+#include <soc/usb.h>
 #include <symbols.h>
+#include <vbe.h>
 
 #include "exynos5250.h"
 
diff --git a/src/mainboard/google/daisy/memlayout.ld b/src/mainboard/google/daisy/memlayout.ld
index 72c018edd2..ead7f47838 100644
--- a/src/mainboard/google/daisy/memlayout.ld
+++ b/src/mainboard/google/daisy/memlayout.ld
@@ -1 +1 @@
-#include <soc/samsung/exynos5250/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/daisy/memory.c b/src/mainboard/google/daisy/memory.c
index 5640f313e0..71abb8142b 100644
--- a/src/mainboard/google/daisy/memory.c
+++ b/src/mainboard/google/daisy/memory.c
@@ -18,14 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <console/console.h>
+#include <soc/gpio.h>
+#include <soc/setup.h>
+#include <soc/dmc.h>
+#include <soc/clk.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <console/console.h>
-
-#include <soc/samsung/exynos5250/gpio.h>
-#include <soc/samsung/exynos5250/setup.h>
-#include <soc/samsung/exynos5250/dmc.h>
-#include <soc/samsung/exynos5250/clk.h>
 
 const struct mem_timings mem_timings[] = {
 	{
diff --git a/src/mainboard/google/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c
index ebd07d7c5e..76de90a198 100644
--- a/src/mainboard/google/daisy/romstage.c
+++ b/src/mainboard/google/daisy/romstage.c
@@ -17,30 +17,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <types.h>
-
+#include <arch/cache.h>
+#include <arch/exception.h>
+#include <arch/stages.h>
 #include <armv7.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <timestamp.h>
-
-#include <arch/cache.h>
-#include <arch/exception.h>
-#include <soc/samsung/exynos5250/i2c.h>
-#include <soc/samsung/exynos5250/clk.h>
-#include <soc/samsung/exynos5250/cpu.h>
-#include <soc/samsung/exynos5250/dmc.h>
-#include <soc/samsung/exynos5250/gpio.h>
-#include <soc/samsung/exynos5250/setup.h>
-#include <soc/samsung/exynos5250/periph.h>
-#include <soc/samsung/exynos5250/power.h>
-#include <soc/samsung/exynos5250/trustzone.h>
-#include <soc/samsung/exynos5250/wakeup.h>
 #include <console/console.h>
 #include <program_loading.h>
-
-#include <drivers/maxim/max77686/max77686.h>
 #include <device/i2c.h>
+#include <drivers/maxim/max77686/max77686.h>
+#include <soc/clk.h>
+#include <soc/cpu.h>
+#include <soc/dmc.h>
+#include <soc/gpio.h>
+#include <soc/i2c.h>
+#include <soc/setup.h>
+#include <soc/periph.h>
+#include <soc/power.h>
+#include <soc/trustzone.h>
+#include <soc/wakeup.h>
+#include <timestamp.h>
+#include <types.h>
 
 #include "exynos5250.h"
 
diff --git a/src/mainboard/google/daisy/wakeup.c b/src/mainboard/google/daisy/wakeup.c
index 8b7fc4b9d2..95ef879cd9 100644
--- a/src/mainboard/google/daisy/wakeup.c
+++ b/src/mainboard/google/daisy/wakeup.c
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <soc/samsung/exynos5250/gpio.h>
-#include <soc/samsung/exynos5250/wakeup.h>
+#include <soc/gpio.h>
+#include <soc/wakeup.h>
 
 int wakeup_need_reset(void)
 {
-- 
cgit v1.2.3