summaryrefslogtreecommitdiff
path: root/arch/arm/mach-rockchip/rk3036-board.c
diff options
context:
space:
mode:
authorKever Yang <kever.yang@rock-chips.com>2017-06-23 08:11:06 (GMT)
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-07-11 10:13:44 (GMT)
commit7805cdf494beb0014590b8bc79338c02c3791f15 (patch)
tree45f16fb0058bcd01c9d5bb0db438bd9cf37df5a2 /arch/arm/mach-rockchip/rk3036-board.c
parent6d1970fa8a8d315af2b5c2c6f0ad5e5c24a382b5 (diff)
downloadu-boot-fsl-qoriq-7805cdf494beb0014590b8bc79338c02c3791f15.tar.xz
rockchip: use common sdram function
Replace the sdram_init() in board init and rockchip_sdram_size() in sdram driver for all the Rockchip SoCs which enable CONFIG_RAM. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Make dram_init() in rk3036-board.c conditional on CONFIG_RAM: Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Diffstat (limited to 'arch/arm/mach-rockchip/rk3036-board.c')
-rw-r--r--arch/arm/mach-rockchip/rk3036-board.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/rk3036-board.c b/arch/arm/mach-rockchip/rk3036-board.c
index bf2b268..26ea23b 100644
--- a/arch/arm/mach-rockchip/rk3036-board.c
+++ b/arch/arm/mach-rockchip/rk3036-board.c
@@ -60,12 +60,18 @@ int board_init(void)
return 0;
}
+#if !CONFIG_IS_ENABLED(RAM)
+/*
+ * When CONFIG_RAM is enabled, the dram_init() function is implemented
+ * in sdram_common.c.
+ */
int dram_init(void)
{
gd->ram_size = sdram_size();
return 0;
}
+#endif
#ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void)