summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/veyron_pinky/board.h2
-rw-r--r--src/mainboard/google/veyron_pinky/boardid.c7
-rw-r--r--src/mainboard/google/veyron_pinky/bootblock.c12
-rw-r--r--src/mainboard/google/veyron_pinky/chromeos.c2
-rw-r--r--src/mainboard/google/veyron_pinky/mainboard.c24
-rw-r--r--src/mainboard/google/veyron_pinky/memlayout.ld2
-rw-r--r--src/mainboard/google/veyron_pinky/reset.c2
-rw-r--r--src/mainboard/google/veyron_pinky/romstage.c25
-rw-r--r--src/mainboard/google/veyron_pinky/sdram_configs.c6
-rw-r--r--src/soc/rockchip/rk3288/Makefile.inc2
-rw-r--r--src/soc/rockchip/rk3288/bootblock.c8
-rw-r--r--src/soc/rockchip/rk3288/cbmem.c5
-rw-r--r--src/soc/rockchip/rk3288/clock.c16
-rw-r--r--src/soc/rockchip/rk3288/gpio.c9
-rw-r--r--src/soc/rockchip/rk3288/i2c.c20
-rw-r--r--src/soc/rockchip/rk3288/include/soc/addressmap.h (renamed from src/soc/rockchip/rk3288/addressmap.h)0
-rw-r--r--src/soc/rockchip/rk3288/include/soc/clock.h (renamed from src/soc/rockchip/rk3288/clock.h)2
-rw-r--r--src/soc/rockchip/rk3288/include/soc/gpio.h (renamed from src/soc/rockchip/rk3288/gpio.h)3
-rw-r--r--src/soc/rockchip/rk3288/include/soc/grf.h (renamed from src/soc/rockchip/rk3288/grf.h)4
-rw-r--r--src/soc/rockchip/rk3288/include/soc/i2c.h (renamed from src/soc/rockchip/rk3288/i2c.h)0
-rw-r--r--src/soc/rockchip/rk3288/include/soc/memlayout.ld (renamed from src/soc/rockchip/rk3288/memlayout.ld)0
-rw-r--r--src/soc/rockchip/rk3288/include/soc/pmu.h (renamed from src/soc/rockchip/rk3288/pmu.h)3
-rw-r--r--src/soc/rockchip/rk3288/include/soc/pwm.h (renamed from src/soc/rockchip/rk3288/pwm.h)0
-rw-r--r--src/soc/rockchip/rk3288/include/soc/rk808.h (renamed from src/soc/rockchip/rk3288/rk808.h)0
-rw-r--r--src/soc/rockchip/rk3288/include/soc/sdram.h (renamed from src/soc/rockchip/rk3288/sdram.h)2
-rw-r--r--src/soc/rockchip/rk3288/include/soc/soc.h (renamed from src/soc/rockchip/rk3288/soc.h)0
-rw-r--r--src/soc/rockchip/rk3288/include/soc/spi.h (renamed from src/soc/rockchip/rk3288/spi.h)0
-rw-r--r--src/soc/rockchip/rk3288/include/soc/timer.h (renamed from src/soc/rockchip/rk3288/timer.h)4
-rw-r--r--src/soc/rockchip/rk3288/include/soc/tsadc.h (renamed from src/soc/rockchip/rk3288/tsadc.h)0
-rw-r--r--src/soc/rockchip/rk3288/media.c3
-rw-r--r--src/soc/rockchip/rk3288/monotonic_timer.c6
-rw-r--r--src/soc/rockchip/rk3288/pwm.c17
-rw-r--r--src/soc/rockchip/rk3288/rk808.c4
-rw-r--r--src/soc/rockchip/rk3288/sdram.c16
-rw-r--r--src/soc/rockchip/rk3288/soc.c17
-rw-r--r--src/soc/rockchip/rk3288/spi.c14
-rw-r--r--src/soc/rockchip/rk3288/timer.c5
-rw-r--r--src/soc/rockchip/rk3288/tsadc.c12
-rw-r--r--src/soc/rockchip/rk3288/uart.c4
39 files changed, 130 insertions, 128 deletions
diff --git a/src/mainboard/google/veyron_pinky/board.h b/src/mainboard/google/veyron_pinky/board.h
index 2ffa9cf996..8d452c8a89 100644
--- a/src/mainboard/google/veyron_pinky/board.h
+++ b/src/mainboard/google/veyron_pinky/board.h
@@ -21,7 +21,7 @@
#define __MAINBOARD_GOOGLE_VEYRON_PINKY_BOARD_H
#include <boardid.h>
-#include <soc/rockchip/rk3288/gpio.h>
+#include <soc/gpio.h>
#define PMIC_BUS 0
diff --git a/src/mainboard/google/veyron_pinky/boardid.c b/src/mainboard/google/veyron_pinky/boardid.c
index ca446a18ae..01e92a3d32 100644
--- a/src/mainboard/google/veyron_pinky/boardid.c
+++ b/src/mainboard/google/veyron_pinky/boardid.c
@@ -17,11 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdlib.h>
-#include <console/console.h>
-#include <soc/rockchip/rk3288/gpio.h>
-
#include <boardid.h>
+#include <console/console.h>
+#include <soc/gpio.h>
+#include <stdlib.h>
uint8_t board_id(void)
{
diff --git a/src/mainboard/google/veyron_pinky/bootblock.c b/src/mainboard/google/veyron_pinky/bootblock.c
index a66d7482d2..b34199dfe5 100644
--- a/src/mainboard/google/veyron_pinky/bootblock.c
+++ b/src/mainboard/google/veyron_pinky/bootblock.c
@@ -20,12 +20,12 @@
#include <arch/io.h>
#include <bootblock_common.h>
-#include <soc/rockchip/rk3288/grf.h>
-#include <soc/rockchip/rk3288/spi.h>
-#include <soc/rockchip/rk3288/rk808.h>
-#include <soc/rockchip/rk3288/clock.h>
-#include <soc/rockchip/rk3288/pmu.h>
-#include <soc/rockchip/rk3288/i2c.h>
+#include <soc/clock.h>
+#include <soc/i2c.h>
+#include <soc/grf.h>
+#include <soc/pmu.h>
+#include <soc/rk808.h>
+#include <soc/spi.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "board.h"
diff --git a/src/mainboard/google/veyron_pinky/chromeos.c b/src/mainboard/google/veyron_pinky/chromeos.c
index 827b004394..30cd277623 100644
--- a/src/mainboard/google/veyron_pinky/chromeos.c
+++ b/src/mainboard/google/veyron_pinky/chromeos.c
@@ -21,9 +21,9 @@
#include <console/console.h>
#include <ec/google/chromeec/ec.h>
#include <ec/google/chromeec/ec_commands.h>
+#include <soc/gpio.h>
#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
-#include <soc/rockchip/rk3288/gpio.h>
#include "board.h"
diff --git a/src/mainboard/google/veyron_pinky/mainboard.c b/src/mainboard/google/veyron_pinky/mainboard.c
index 19d66757ba..a8cc3c3aa4 100644
--- a/src/mainboard/google/veyron_pinky/mainboard.c
+++ b/src/mainboard/google/veyron_pinky/mainboard.c
@@ -17,22 +17,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
-#include <device/device.h>
#include <arch/cache.h>
+#include <arch/io.h>
+#include <console/console.h>
#include <delay.h>
+#include <device/device.h>
#include <edid.h>
-#include <symbols.h>
-#include <vbe.h>
#include <boot/coreboot_tables.h>
#include <device/i2c.h>
-#include <soc/rockchip/rk3288/gpio.h>
-#include <soc/rockchip/rk3288/soc.h>
-#include <soc/rockchip/rk3288/pmu.h>
-#include <soc/rockchip/rk3288/clock.h>
-#include <soc/rockchip/rk3288/rk808.h>
-#include <soc/rockchip/rk3288/spi.h>
-#include <soc/rockchip/rk3288/i2c.h>
+#include <soc/gpio.h>
+#include <soc/grf.h>
+#include <soc/soc.h>
+#include <soc/pmu.h>
+#include <soc/clock.h>
+#include <soc/rk808.h>
+#include <soc/spi.h>
+#include <soc/i2c.h>
+#include <symbols.h>
+#include <vbe.h>
#include "board.h"
diff --git a/src/mainboard/google/veyron_pinky/memlayout.ld b/src/mainboard/google/veyron_pinky/memlayout.ld
index a8b7465c5e..ead7f47838 100644
--- a/src/mainboard/google/veyron_pinky/memlayout.ld
+++ b/src/mainboard/google/veyron_pinky/memlayout.ld
@@ -1 +1 @@
-#include <soc/rockchip/rk3288/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/veyron_pinky/reset.c b/src/mainboard/google/veyron_pinky/reset.c
index 45c28b286f..a2777f86d6 100644
--- a/src/mainboard/google/veyron_pinky/reset.c
+++ b/src/mainboard/google/veyron_pinky/reset.c
@@ -18,7 +18,7 @@
*/
#include <arch/io.h>
-#include <soc/rockchip/rk3288/gpio.h>
+#include <soc/gpio.h>
#include <reset.h>
#include "board.h"
diff --git a/src/mainboard/google/veyron_pinky/romstage.c b/src/mainboard/google/veyron_pinky/romstage.c
index ab7903c7b3..38166eda3f 100644
--- a/src/mainboard/google/veyron_pinky/romstage.c
+++ b/src/mainboard/google/veyron_pinky/romstage.c
@@ -17,26 +17,27 @@
* 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 <assert.h>
#include <cbfs.h>
-#include <console/console.h>
#include <cbmem.h>
+#include <console/console.h>
#include <delay.h>
#include <program_loading.h>
-#include <timestamp.h>
-#include <arch/cache.h>
-#include <arch/exception.h>
+#include <soc/sdram.h>
+#include <soc/clock.h>
+#include <soc/pwm.h>
+#include <soc/grf.h>
+#include <soc/tsadc.h>
#include <stdlib.h>
-#include <assert.h>
-#include <vendorcode/google/chromeos/chromeos.h>
-#include <soc/rockchip/rk3288/sdram.h>
-#include <soc/rockchip/rk3288/clock.h>
-#include <soc/rockchip/rk3288/pwm.h>
-#include <soc/rockchip/rk3288/grf.h>
-#include <soc/rockchip/rk3288/tsadc.h>
#include <symbols.h>
+#include <timestamp.h>
+#include <types.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
#include "timer.h"
static void regulate_vdd_log(unsigned int mv)
diff --git a/src/mainboard/google/veyron_pinky/sdram_configs.c b/src/mainboard/google/veyron_pinky/sdram_configs.c
index cc29de08d2..1a331cebef 100644
--- a/src/mainboard/google/veyron_pinky/sdram_configs.c
+++ b/src/mainboard/google/veyron_pinky/sdram_configs.c
@@ -17,11 +17,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/io.h>
+#include <console/console.h>
+#include <soc/sdram.h>
+#include <soc/gpio.h>
#include <string.h>
#include <types.h>
-#include <console/console.h>
-#include <soc/rockchip/rk3288/sdram.h>
-#include <soc/rockchip/rk3288/gpio.h>
static struct rk3288_sdram_params sdram_configs[] = {
#include "sdram_inf/sdram-lpddr3-samsung-2GB.inc" /* ram_code = 0000 */
diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 076f0dc89d..9885aaf2c8 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -68,6 +68,8 @@ ramstage-y += rk808.c
ramstage-y += pwm.c
ramstage-$(CONFIG_DRIVERS_UART) += uart.c
+CPPFLAGS_common += -Isrc/soc/rockchip/rk3288/include/
+
$(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
cp $< $@
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index b2f5bd9553..26a6569f29 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -21,11 +21,11 @@
#include <arch/io.h>
#include <bootblock_common.h>
#include <console/console.h>
-#include <soc/rockchip/rk3288/grf.h>
+#include <soc/addressmap.h>
+#include <soc/clock.h>
+#include <soc/grf.h>
+#include <soc/timer.h>
#include <symbols.h>
-#include "addressmap.h"
-#include "timer.h"
-#include "clock.h"
static void bootblock_cpu_init(void)
{
diff --git a/src/soc/rockchip/rk3288/cbmem.c b/src/soc/rockchip/rk3288/cbmem.c
index dc1e0aa4cd..1c3a902d0e 100644
--- a/src/soc/rockchip/rk3288/cbmem.c
+++ b/src/soc/rockchip/rk3288/cbmem.c
@@ -17,9 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stddef.h>
#include <cbmem.h>
-#include "soc.h"
+#include <soc/soc.h>
+#include <stddef.h>
+
void *cbmem_top(void)
{
return (void *)(get_fb_base_kb()*KiB);
diff --git a/src/soc/rockchip/rk3288/clock.c b/src/soc/rockchip/rk3288/clock.c
index 5ad431cc33..d95257f610 100644
--- a/src/soc/rockchip/rk3288/clock.c
+++ b/src/soc/rockchip/rk3288/clock.c
@@ -17,17 +17,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <assert.h>
-#include <stdlib.h>
#include <arch/io.h>
-#include <stdint.h>
-#include <string.h>
+#include <assert.h>
#include <console/console.h>
#include <delay.h>
-#include "clock.h"
-#include "grf.h"
-#include "addressmap.h"
-#include "soc.h"
+#include <soc/addressmap.h>
+#include <soc/clock.h>
+#include <soc/grf.h>
+#include <soc/soc.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
struct pll_div {
u32 nr;
diff --git a/src/soc/rockchip/rk3288/gpio.c b/src/soc/rockchip/rk3288/gpio.c
index 2d1ae15d6a..c3784ec4a8 100644
--- a/src/soc/rockchip/rk3288/gpio.c
+++ b/src/soc/rockchip/rk3288/gpio.c
@@ -17,12 +17,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
#include <arch/io.h>
+#include <console/console.h>
+#include <soc/soc.h>
+#include <soc/gpio.h>
+#include <soc/grf.h>
+#include <soc/pmu.h>
#include <stdlib.h>
-#include "soc.h"
-#include "gpio.h"
-#include "pmu.h"
struct rk3288_gpio_regs *gpio_port[] = {
(struct rk3288_gpio_regs *)0xff750000,
diff --git a/src/soc/rockchip/rk3288/i2c.c b/src/soc/rockchip/rk3288/i2c.c
index eb480a7d30..d69bb7cb78 100644
--- a/src/soc/rockchip/rk3288/i2c.c
+++ b/src/soc/rockchip/rk3288/i2c.c
@@ -17,21 +17,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
#include <arch/io.h>
-#include <stdlib.h>
#include <assert.h>
-
-#include <delay.h>
#include <cbfs.h>
-#include <string.h>
+#include <console/console.h>
+#include <delay.h>
#include <device/i2c.h>
-
-#include "addressmap.h"
-#include "grf.h"
-#include "soc.h"
-#include "i2c.h"
-#include "clock.h"
+#include <soc/addressmap.h>
+#include <soc/grf.h>
+#include <soc/soc.h>
+#include <soc/i2c.h>
+#include <soc/clock.h>
+#include <stdlib.h>
+#include <string.h>
#define RETRY_COUNT 3
/* 100000us = 100ms */
diff --git a/src/soc/rockchip/rk3288/addressmap.h b/src/soc/rockchip/rk3288/include/soc/addressmap.h
index aea3bc0081..aea3bc0081 100644
--- a/src/soc/rockchip/rk3288/addressmap.h
+++ b/src/soc/rockchip/rk3288/include/soc/addressmap.h
diff --git a/src/soc/rockchip/rk3288/clock.h b/src/soc/rockchip/rk3288/include/soc/clock.h
index e2e8f3f8fb..d11c6ec0f3 100644
--- a/src/soc/rockchip/rk3288/clock.h
+++ b/src/soc/rockchip/rk3288/include/soc/clock.h
@@ -20,7 +20,7 @@
#ifndef __SOC_ROCKCHIP_RK3288_CLOCK_H__
#define __SOC_ROCKCHIP_RK3288_CLOCK_H__
-#include "addressmap.h"
+#include <soc/addressmap.h>
#define OSC_HZ (24*MHz)
diff --git a/src/soc/rockchip/rk3288/gpio.h b/src/soc/rockchip/rk3288/include/soc/gpio.h
index 7049ddffe2..c459de9321 100644
--- a/src/soc/rockchip/rk3288/gpio.h
+++ b/src/soc/rockchip/rk3288/include/soc/gpio.h
@@ -20,8 +20,7 @@
#ifndef __SOC_ROCKCHIP_RK3288_GPIO_H__
#define __SOC_ROCKCHIP_RK3288_GPIO_H__
-#include "addressmap.h"
-#include "grf.h"
+#include <types.h>
#define GPIO(p, b, i) ((gpio_t){.port = p, .bank = GPIO_##b, .idx = i})
diff --git a/src/soc/rockchip/rk3288/grf.h b/src/soc/rockchip/rk3288/include/soc/grf.h
index e84359bfe0..832563830b 100644
--- a/src/soc/rockchip/rk3288/grf.h
+++ b/src/soc/rockchip/rk3288/include/soc/grf.h
@@ -20,9 +20,9 @@
#ifndef __SOC_ROCKCHIP_RK3288_GRF_H__
#define __SOC_ROCKCHIP_RK3288_GRF_H__
+#include <soc/addressmap.h>
+#include <soc/soc.h>
#include <types.h>
-#include "addressmap.h"
-#include "soc.h"
struct rk3288_grf_gpio_lh {
u32 l;
diff --git a/src/soc/rockchip/rk3288/i2c.h b/src/soc/rockchip/rk3288/include/soc/i2c.h
index 84d9b7587b..84d9b7587b 100644
--- a/src/soc/rockchip/rk3288/i2c.h
+++ b/src/soc/rockchip/rk3288/include/soc/i2c.h
diff --git a/src/soc/rockchip/rk3288/memlayout.ld b/src/soc/rockchip/rk3288/include/soc/memlayout.ld
index 2ddb6a6077..2ddb6a6077 100644
--- a/src/soc/rockchip/rk3288/memlayout.ld
+++ b/src/soc/rockchip/rk3288/include/soc/memlayout.ld
diff --git a/src/soc/rockchip/rk3288/pmu.h b/src/soc/rockchip/rk3288/include/soc/pmu.h
index 23ca8b11d5..2a935156a0 100644
--- a/src/soc/rockchip/rk3288/pmu.h
+++ b/src/soc/rockchip/rk3288/include/soc/pmu.h
@@ -19,7 +19,8 @@
#ifndef __SOC_ROCKCHIP_RK3288_PMU_H__
#define __SOC_ROCKCHIP_RK3288_PMU_H__
-#include "addressmap.h"
+
+#include <soc/addressmap.h>
struct rk3288_pmu_regs {
u32 wakeup_cfg[2];
diff --git a/src/soc/rockchip/rk3288/pwm.h b/src/soc/rockchip/rk3288/include/soc/pwm.h
index 168d8a77d4..168d8a77d4 100644
--- a/src/soc/rockchip/rk3288/pwm.h
+++ b/src/soc/rockchip/rk3288/include/soc/pwm.h
diff --git a/src/soc/rockchip/rk3288/rk808.h b/src/soc/rockchip/rk3288/include/soc/rk808.h
index e03ace844e..e03ace844e 100644
--- a/src/soc/rockchip/rk3288/rk808.h
+++ b/src/soc/rockchip/rk3288/include/soc/rk808.h
diff --git a/src/soc/rockchip/rk3288/sdram.h b/src/soc/rockchip/rk3288/include/soc/sdram.h
index 1da14b7ed5..16e4f81713 100644
--- a/src/soc/rockchip/rk3288/sdram.h
+++ b/src/soc/rockchip/rk3288/include/soc/sdram.h
@@ -20,8 +20,6 @@
#ifndef __SOC_ROCKCHIP_RK3288_SDRAM_H__
#define __SOC_ROCKCHIP_RK3288_SDRAM_H__
-#include <arch/io.h>
-
enum {
DDR3 = 3,
LPDDR3 = 6,
diff --git a/src/soc/rockchip/rk3288/soc.h b/src/soc/rockchip/rk3288/include/soc/soc.h
index 00f35b2f3c..00f35b2f3c 100644
--- a/src/soc/rockchip/rk3288/soc.h
+++ b/src/soc/rockchip/rk3288/include/soc/soc.h
diff --git a/src/soc/rockchip/rk3288/spi.h b/src/soc/rockchip/rk3288/include/soc/spi.h
index bba38ef075..bba38ef075 100644
--- a/src/soc/rockchip/rk3288/spi.h
+++ b/src/soc/rockchip/rk3288/include/soc/spi.h
diff --git a/src/soc/rockchip/rk3288/timer.h b/src/soc/rockchip/rk3288/include/soc/timer.h
index 85079391e6..230168637c 100644
--- a/src/soc/rockchip/rk3288/timer.h
+++ b/src/soc/rockchip/rk3288/include/soc/timer.h
@@ -21,9 +21,9 @@
#define __SOC_ROCKCHIP_RK3288_TIMER_H__
#include <inttypes.h>
+#include <soc/addressmap.h>
+#include <soc/clock.h>
#include <timer.h>
-#include "addressmap.h"
-#include "clock.h"
static const u32 clocks_per_usec = OSC_HZ/USECS_PER_SEC;
diff --git a/src/soc/rockchip/rk3288/tsadc.h b/src/soc/rockchip/rk3288/include/soc/tsadc.h
index 7412110cab..7412110cab 100644
--- a/src/soc/rockchip/rk3288/tsadc.h
+++ b/src/soc/rockchip/rk3288/include/soc/tsadc.h
diff --git a/src/soc/rockchip/rk3288/media.c b/src/soc/rockchip/rk3288/media.c
index f2471f9b5a..7f0ea518f2 100644
--- a/src/soc/rockchip/rk3288/media.c
+++ b/src/soc/rockchip/rk3288/media.c
@@ -18,10 +18,9 @@
*/
#include <cbfs.h>
+#include <soc/spi.h>
#include <symbols.h>
-#include "spi.h"
-
int init_default_cbfs_media(struct cbfs_media *media)
{
return initialize_rockchip_spi_cbfs_media(media,
diff --git a/src/soc/rockchip/rk3288/monotonic_timer.c b/src/soc/rockchip/rk3288/monotonic_timer.c
index d33ed6858c..4062860465 100644
--- a/src/soc/rockchip/rk3288/monotonic_timer.c
+++ b/src/soc/rockchip/rk3288/monotonic_timer.c
@@ -17,11 +17,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <arch/io.h>
+#include <soc/addressmap.h>
+#include <soc/timer.h>
#include <stdint.h>
#include <timer.h>
-#include <arch/io.h>
-#include "addressmap.h"
-#include "timer.h"
static uint64_t timer_raw_value(void)
{
diff --git a/src/soc/rockchip/rk3288/pwm.c b/src/soc/rockchip/rk3288/pwm.c
index 7f659f2f38..a44724959e 100644
--- a/src/soc/rockchip/rk3288/pwm.c
+++ b/src/soc/rockchip/rk3288/pwm.c
@@ -17,18 +17,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
#include <arch/io.h>
-#include <stdlib.h>
#include <assert.h>
-#include <timer.h>
+#include <console/console.h>
#include <delay.h>
-
-#include "addressmap.h"
-#include "grf.h"
-#include "soc.h"
-#include "pwm.h"
-#include "clock.h"
+#include <soc/addressmap.h>
+#include <soc/grf.h>
+#include <soc/soc.h>
+#include <soc/pwm.h>
+#include <soc/clock.h>
+#include <stdlib.h>
+#include <timer.h>
struct pwm_ctl {
u32 pwm_cnt;
diff --git a/src/soc/rockchip/rk3288/rk808.c b/src/soc/rockchip/rk3288/rk808.c
index 48cfa8603e..aa39b8d5ee 100644
--- a/src/soc/rockchip/rk3288/rk808.c
+++ b/src/soc/rockchip/rk3288/rk808.c
@@ -19,11 +19,11 @@
#include <assert.h>
#include <console/console.h>
+#include <delay.h>
#include <device/i2c.h>
+#include <soc/rk808.h>
#include <stdint.h>
#include <stdlib.h>
-#include <delay.h>
-#include "rk808.h"
#define RK808_ADDR 0x1b
diff --git a/src/soc/rockchip/rk3288/sdram.c b/src/soc/rockchip/rk3288/sdram.c
index 2b0a396bb7..d49b860f62 100644
--- a/src/soc/rockchip/rk3288/sdram.c
+++ b/src/soc/rockchip/rk3288/sdram.c
@@ -17,16 +17,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/io.h>
-#include <string.h>
-#include <types.h>
#include <console/console.h>
#include <delay.h>
-#include "addressmap.h"
-#include "clock.h"
-#include "sdram.h"
-#include "grf.h"
-#include "soc.h"
-#include "pmu.h"
+#include <soc/addressmap.h>
+#include <soc/clock.h>
+#include <soc/sdram.h>
+#include <soc/grf.h>
+#include <soc/soc.h>
+#include <soc/pmu.h>
+#include <string.h>
+#include <types.h>
struct rk3288_ddr_pctl_regs {
u32 scfg;
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index 0985c0843f..f5e52eb4e2 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -17,16 +17,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
-#include <delay.h>
+#include <arch/cache.h>
+#include <cbmem.h>
#include <console/console.h>
+#include <delay.h>
#include <device/device.h>
-#include <cbmem.h>
-#include <arch/cache.h>
-#include <soc/rockchip/rk3288/gpio.h>
-#include "soc.h"
+#include <soc/gpio.h>
+#include <soc/soc.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
#include "chip.h"
static void soc_enable(device_t dev)
diff --git a/src/soc/rockchip/rk3288/spi.c b/src/soc/rockchip/rk3288/spi.c
index 796107e071..6ece8c1ed0 100644
--- a/src/soc/rockchip/rk3288/spi.c
+++ b/src/soc/rockchip/rk3288/spi.c
@@ -17,18 +17,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
#include <arch/io.h>
-#include <stdlib.h>
#include <assert.h>
+#include <console/console.h>
+#include <delay.h>
+#include <endian.h>
+#include <soc/addressmap.h>
+#include <soc/spi.h>
+#include <soc/clock.h>
#include <spi-generic.h>
#include <spi_flash.h>
-#include <delay.h>
+#include <stdlib.h>
#include <timer.h>
-#include <endian.h>
-#include "addressmap.h"
-#include "spi.h"
-#include "clock.h"
struct rockchip_spi_slave {
struct spi_slave slave;
diff --git a/src/soc/rockchip/rk3288/timer.c b/src/soc/rockchip/rk3288/timer.c
index 91186cc84f..7162482406 100644
--- a/src/soc/rockchip/rk3288/timer.c
+++ b/src/soc/rockchip/rk3288/timer.c
@@ -17,10 +17,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <arch/io.h>
#include <console/console.h>
#include <delay.h>
-#include <arch/io.h>
-#include "timer.h"
+#include <soc/timer.h>
+#include <timer.h>
void init_timer(void)
{
diff --git a/src/soc/rockchip/rk3288/tsadc.c b/src/soc/rockchip/rk3288/tsadc.c
index 73980a0d48..b7d8e9d8ab 100644
--- a/src/soc/rockchip/rk3288/tsadc.c
+++ b/src/soc/rockchip/rk3288/tsadc.c
@@ -17,16 +17,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <arch/io.h>
#include <assert.h>
#include <console/console.h>
+#include <delay.h>
+#include <soc/clock.h>
+#include <soc/grf.h>
+#include <soc/pmu.h>
+#include <soc/tsadc.h>
#include <stdint.h>
#include <stdlib.h>
-#include <arch/io.h>
-#include <delay.h>
-#include "tsadc.h"
-#include "clock.h"
-#include "pmu.h"
-#include "grf.h"
struct rk3288_tsadc_regs {
u32 user_con;
diff --git a/src/soc/rockchip/rk3288/uart.c b/src/soc/rockchip/rk3288/uart.c
index 60b14a3209..01759fe573 100644
--- a/src/soc/rockchip/rk3288/uart.c
+++ b/src/soc/rockchip/rk3288/uart.c
@@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/uart.h>
#include <arch/io.h>
#include <boot/coreboot_tables.h>
#include <console/console.h> /* for __console definition */
-#include <stdint.h>
+#include <console/uart.h>
#include <drivers/uart/uart8250reg.h>
+#include <stdint.h>
/*
* TODO: Use DRIVERS_UART_8250MEM driver instead.