From 3794e7cb5d29de16da65514439313417fd3271ae Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 3 Nov 2015 09:34:53 +0100 Subject: DDR3 conf: autodetect RAM size Use get_ram_size() to autodetect up to 2Gbyte of RAM on rank 0. If chips with two ranks would get stuffed one would have to set the size of one rank in DDRC_ADDRMAP0. --- board/toradex/colibri_imx7/colibri_imx7.c | 2 +- board/toradex/colibri_imx7/imximage.cfg | 8 ++++---- include/configs/colibri_imx7.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 81d6e59e0f..5a3a182721 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -108,7 +108,7 @@ struct i2c_pads_info i2c_pad_info3 = { int dram_init(void) { - gd->ram_size = PHYS_SDRAM_SIZE; + gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); return 0; } diff --git a/board/toradex/colibri_imx7/imximage.cfg b/board/toradex/colibri_imx7/imximage.cfg index 4ca885ce32..558dbf9b55 100644 --- a/board/toradex/colibri_imx7/imximage.cfg +++ b/board/toradex/colibri_imx7/imximage.cfg @@ -103,13 +103,13 @@ DATA 4 0x307a0190 0x02098204 /* DDRC_DFITMG1 */ DATA 4 0x307a0194 0x00030303 /* DDRC_ADDRMAP0 */ -DATA 4 0x307a0200 0x00000016 +DATA 4 0x307a0200 0x0000001f /* DDRC_ADDRMAP1 */ -DATA 4 0x307a0204 0x00171717 +DATA 4 0x307a0204 0x00080808 /* DDRC_ADDRMAP5 */ -DATA 4 0x307a0214 0x04040404 +DATA 4 0x307a0214 0x07070707 /* DDRC_ADDRMAP6 */ -DATA 4 0x307a0218 0x0f040404 +DATA 4 0x307a0218 0x07070707 /* DDRC_ODTCFG */ DATA 4 0x307a0240 0x06000601 /* DDRC_ODTMAP */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 3d87872219..920a4eb626 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -71,7 +71,7 @@ #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define PHYS_SDRAM_SIZE SZ_1G +#define PHYS_SDRAM_SIZE SZ_2G #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -278,7 +278,7 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x20000000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1c000000) #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -- cgit v1.2.3