ipq806x: Change all SoC headers to <soc/headername.h> system

This patch aligns ipq806x 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 Storm.

Change-Id: Icb81a77e6f458625f5379a980e8760388dd3a1f9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 1bf23774c9ffa5d08c211f3658d39adcfa47b339
Original-Change-Id: I283cc7e6094be977d67ed4146f376cebcea6774a
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/224502
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9368
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: Patrick Georgi <pgeorgi@google.com>

10 files changed, 44 insertions, 2 deletions

diff --git a/src/soc/qualcomm/ipq806x/include/cdp.h b/src/soc/qualcomm/ipq806x/include/soc/cdp.h
index 15f91cb169..c7de23f4e8 100644
--- a/src/soc/qualcomm/ipq806x/include/cdp.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/cdp.h
@@ -4,6 +4,8 @@
 #ifndef  _IPQ806X_CDP_H_
 #define  _IPQ806X_CDP_H_
 
+#include <types.h>
+
 unsigned smem_get_board_machtype(void);
 
 typedef enum {
diff --git a/src/soc/qualcomm/ipq806x/include/clock.h b/src/soc/qualcomm/ipq806x/include/soc/clock.h
index d9e783479c..837b831680 100644
--- a/src/soc/qualcomm/ipq806x/include/clock.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/clock.h
@@ -33,7 +33,7 @@
 #ifndef __IPQ860X_CLOCK_H_
 #define __IPQ860X_CLOCK_H_
 
-#include <iomap.h>
+#include <soc/iomap.h>
 
 /* UART clock @ 7.3728 MHz */
 #define UART_DM_CLK_RX_TX_BIT_RATE 0xCC
diff --git a/src/soc/qualcomm/ipq806x/include/gpio.h b/src/soc/qualcomm/ipq806x/include/soc/gpio.h
index 276022c0af..276022c0af 100644
--- a/src/soc/qualcomm/ipq806x/include/gpio.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/gpio.h
diff --git a/src/soc/qualcomm/ipq806x/include/gsbi.h b/src/soc/qualcomm/ipq806x/include/soc/gsbi.h
index c12d6fd7b4..c12d6fd7b4 100644
--- a/src/soc/qualcomm/ipq806x/include/gsbi.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/gsbi.h
diff --git a/src/soc/qualcomm/ipq806x/include/iomap.h b/src/soc/qualcomm/ipq806x/include/soc/iomap.h
index c9c8fc413a..ad7056e0fe 100644
--- a/src/soc/qualcomm/ipq806x/include/iomap.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/iomap.h
@@ -37,7 +37,7 @@
 #define __SOC_QUALCOMM_IPQ806X_IOMAP_H_
 
 #include <arch/io.h>
-#include <cdp.h>
+#include <soc/cdp.h>
 
 /* Typecast to allow integers being passed as address
    This needs to be included because vendor code is not compliant with our
diff --git a/src/soc/qualcomm/ipq806x/include/ipq_timer.h b/src/soc/qualcomm/ipq806x/include/soc/ipq_timer.h
index 4e1ef34294..4e1ef34294 100644
--- a/src/soc/qualcomm/ipq806x/include/ipq_timer.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/ipq_timer.h
diff --git a/src/soc/qualcomm/ipq806x/include/ipq_uart.h b/src/soc/qualcomm/ipq806x/include/soc/ipq_uart.h
index 90ca7047a2..90ca7047a2 100644
--- a/src/soc/qualcomm/ipq806x/include/ipq_uart.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/ipq_uart.h
diff --git a/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld
new file mode 100644
index 0000000000..de1b12935c
--- /dev/null
+++ b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <memlayout.h>
+
+#include <arch/header.ld>
+
+/* TODO: This should be revised by someone who understands the SoC better. */
+
+SECTIONS
+{
+	/* TODO: add SRAM_START(), SRAM_END() and REGION(reserved_sbl) */
+	TTB(0x2A05C000, 48K)
+
+	DRAM_START(0x40000000)
+	CBFS_CACHE(0x405C0000, 240K)
+	STACK(0x405FC000, 16K)
+	/* TODO: "256K bytes left for TZBSP"... what does that mean? */
+	BOOTBLOCK(0x40600000, 32K)
+	PRERAM_CBMEM_CONSOLE(0x40618000, 8K)
+	ROMSTAGE(0x40620000, 128K)
+	RAMSTAGE(0x40640000, 128K)
+	DMA_COHERENT(0x5A000000, 2M)
+}
diff --git a/src/soc/qualcomm/ipq806x/include/spi.h b/src/soc/qualcomm/ipq806x/include/soc/spi.h
index f7dda07a51..f7dda07a51 100644
--- a/src/soc/qualcomm/ipq806x/include/spi.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/spi.h
diff --git a/src/soc/qualcomm/ipq806x/include/usb.h b/src/soc/qualcomm/ipq806x/include/soc/usb.h
index c3c4c48ce9..c3c4c48ce9 100644
--- a/src/soc/qualcomm/ipq806x/include/usb.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/usb.h