summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm926ejs/kirkwood
diff options
context:
space:
mode:
authorPrafulla Wadaskar <prafulla@marvell.com>2010-09-30 19:33:19 +0530
committerWolfgang Denk <wd@denx.de>2010-10-13 09:36:07 +0200
commitbeeb2589761d218076b2b5ed5699a08216ca8cf9 (patch)
tree06e12d51a9f3a919f029f1d1ee88f6c320c2a173 /arch/arm/cpu/arm926ejs/kirkwood
parent500f2ff52a812d6ffd50b81978375116815f7f5b (diff)
downloadu-boot-imx-beeb2589761d218076b2b5ed5699a08216ca8cf9.zip
u-boot-imx-beeb2589761d218076b2b5ed5699a08216ca8cf9.tar.gz
u-boot-imx-beeb2589761d218076b2b5ed5699a08216ca8cf9.tar.bz2
Kirkwood: dram_init is moved to dram.c
For all Kirkwood boards so far dram_init function is duplicated dram_init function is moved to dram.c and relevant code from all board specific files removed If any board needs specific dram init handling than standard one, then, a macro CONFIG_SYS_BOARD_DRAM_INIT should be defined in board config header file and the dram_init function can be put in board specific source file For ex. keymile boards Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/kirkwood')
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/dram.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
index 8f2a18a..7439c87 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
@@ -23,8 +23,11 @@
*/
#include <config.h>
+#include <common.h>
#include <asm/arch/kirkwood.h>
+DECLARE_GLOBAL_DATA_PTR;
+
#define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + (x * 0x08))
#define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + (x * 0x08))
/*
@@ -56,3 +59,38 @@ u32 kw_sdram_bs(enum memory_bank bank)
result += 0x01000000;
return result;
}
+
+#ifndef CONFIG_SYS_BOARD_DRAM_INIT
+int dram_init(void)
+{
+ int i;
+
+ gd->ram_size = 0;
+ for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+ gd->bd->bi_dram[i].start = kw_sdram_bar(i);
+ gd->bd->bi_dram[i].size = kw_sdram_bs(i);
+ /*
+ * It is assumed that all memory banks are consecutive
+ * and without gaps.
+ * If the gap is found, ram_size will be reported for
+ * consecutive memory only
+ */
+ if (gd->bd->bi_dram[i].start != gd->ram_size)
+ break;
+
+ gd->ram_size += gd->bd->bi_dram[i].size;
+
+ }
+ return 0;
+}
+
+/*
+ * If this function is not defined here,
+ * board.c alters dram bank zero configuration defined above.
+ */
+void dram_init_banksize(void)
+{
+ dram_init();
+}
+#endif /* CONFIG_SYS_BOARD_DRAM_INIT */
+