From ade6d65fa167bb7a6f9e4c5af94229600a8fade2 Mon Sep 17 00:00:00 2001
From: Zhihuan He <huan.he@rock-chips.com>
Date: Fri, 20 Jul 2018 15:46:33 +0800
Subject: [PATCH] rockchip: sdram_common: move BROM_BOOTSOURCE_ID_ADDR to
 sdram_common.h

Change-Id: I35d33524ffb19da21bf12622b5cbfd9933ea5a49
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
---
 arch/arm/include/asm/arch-rockchip/sdram_common.h | 2 ++
 arch/arm/mach-rockchip/Kconfig                    | 1 +
 arch/arm/mach-rockchip/spl.c                      | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h
index 33c8192f8e..d250759c11 100644
--- a/arch/arm/include/asm/arch-rockchip/sdram_common.h
+++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h
@@ -78,6 +78,8 @@ enum {
 #define SYS_REG1_CS1_COL_SHIFT(ch)		(0 + (ch) * 2)
 #define SYS_REG1_CS1_COL_MASK			3
 
+#define BROM_BOOTSOURCE_ID_ADDR (CONFIG_ROCKCHIP_IRAM_START_ADDR + 0x10)
+
 /* Get sdram size decode from reg */
 size_t rockchip_sdram_size(phys_addr_t reg);
 
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index bd09ce3917..d6b5c91f80 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -345,6 +345,7 @@ config ROCKCHIP_IRAM_START_ADDR
 	default 0x10080000 if ROCKCHIP_RK3188
 	default 0x10080000 if ROCKCHIP_RK322X
 	default 0xff700000 if ROCKCHIP_RK3288
+	default 0xfff80000 if ROCKCHIP_RK3308
 	default 0xff091000 if ROCKCHIP_RK3328
 	default 0xff8c0000 if ROCKCHIP_RK3368
 	default 0xff8c0000 if ROCKCHIP_RK3399
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 53ff85b00a..b0de24030a 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -10,12 +10,12 @@
 #include <ram.h>
 #include <spl.h>
 #include <asm/arch/bootrom.h>
+#include <asm/arch/sdram_common.h>
 #include <asm/arch-rockchip/sys_proto.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define BROM_BOOTSOURCE_ID_ADDR (CONFIG_ROCKCHIP_IRAM_START_ADDR + 0x10)
 void board_return_to_bootrom(void)
 {
 	back_to_bootrom(BROM_BOOT_NEXTSTAGE);