summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-10-29 16:44:37 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-10-29 16:44:37 +0100
commit82a8e0fc5960a4b73c790bee833111407a46f262 (patch)
tree3b5a985caf22e10d9867e9be6bb30f1558f20236
parentd44b11473874f5de06addd142d8ee394796bba2d (diff)
apalis_imx6.c/colibri_imx6.c: use get_ram_size()
This gives a fast basic ram test. While at it clean up whitespace
-rw-r--r--board/toradex/apalis_imx6/apalis_imx6.c4
-rw-r--r--board/toradex/colibri_imx6/colibri_imx6.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index d98777bf56..ae09cb2041 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -76,7 +76,9 @@ static unsigned char config_block[roundup(CONFIG_BLOCK_BUFFER_SIZE, ARCH_DMA_MIN
int dram_init(void)
{
- gd->ram_size = ((ulong)CONFIG_DDR_MB * 1024 * 1024);
+ /* use the DDR controllers configured size */
+ gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ (ulong)imx_ddr_size());
return 0;
}
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 21b9592af7..bf52df5e93 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -77,7 +77,8 @@ static unsigned char config_block[roundup(CONFIG_BLOCK_BUFFER_SIZE, ARCH_DMA_MIN
int dram_init(void)
{
/* use the DDR controllers configured size */
- gd->ram_size = imx_ddr_size();
+ gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ (ulong)imx_ddr_size());
return 0;
}
@@ -805,11 +806,8 @@ int do_patch_ddr_size(cmd_tbl_t *cmdtp, int flag, int argc,
/* read IVT */
mmc = find_mmc_device(0);
ret = mmc->block_dev.block_read(0, 2, 2, ivt);
-
/* FIXME: Parse IVT to find DCD, parse DCD to find correct write addr */
if(ret == 2) {
-
-
if(is_cpu_type(MXC_CPU_MX6DL) && (ivt[0x215] == 0x19)) {
ivt[0x215] = 0x1a;
ret = mmc->block_dev.block_write(0, 2, 2, ivt);