minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

83xx, kmeter1: autodetect size of DDR II RAM

Browse Source 
it is possible that some board variants have different DDR II
RAM sizes. So we autodetect the size of the assembled RAM.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
This commit is contained in:
Heiko Schocher 2009-02-24 11:30:40 +01:00 committed by Kim Phillips
parent c1bce4fff7
commit 118cbe3c35
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
board/keymile/kmeter1/kmeter1.c
View File

@ -29,6 +29,8 @@
#include "../common/common.h" #include "../common/common.h"
extern void disable_addr_trans (void);
extern void enable_addr_trans (void);
const qe_iop_conf_t qe_iop_conf_tab[] = { const qe_iop_conf_t qe_iop_conf_tab[] = {
/* port pin dir open_drain assign */ /* port pin dir open_drain assign */
@ -111,16 +113,7 @@ int fixed_sdram(void)
u32 ddr_size; u32 ddr_size;
u32 ddr_size_log2; u32 ddr_size_log2;
msize = CONFIG_SYS_DDR_SIZE; im->sysconf.ddrlaw[0].ar = LAWAR_EN | 0x1e;
for (ddr_size = msize << 20, ddr_size_log2 = 0;
(ddr_size > 1); ddr_size = ddr_size >> 1, ddr_size_log2++) {
if (ddr_size & 1)
return -1;
}
im->sysconf.ddrlaw[0].ar =
LAWAR_EN | ((ddr_size_log2 - 1) & LAWAR_SIZE);
im->ddr.csbnds[0].csbnds = CONFIG_SYS_DDR_CS0_BNDS; im->ddr.csbnds[0].csbnds = CONFIG_SYS_DDR_CS0_BNDS;
im->ddr.cs_config[0] = CONFIG_SYS_DDR_CS0_CONFIG; im->ddr.cs_config[0] = CONFIG_SYS_DDR_CS0_CONFIG;
im->ddr.timing_cfg_0 = CONFIG_SYS_DDR_TIMING_0; im->ddr.timing_cfg_0 = CONFIG_SYS_DDR_TIMING_0;
@ -136,6 +129,21 @@ int fixed_sdram(void)
udelay (200); udelay (200);
im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN; im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN;
msize = CONFIG_SYS_DDR_SIZE << 20;
disable_addr_trans ();
msize = get_ram_size (CONFIG_SYS_DDR_BASE, msize);
enable_addr_trans ();
msize /= (1024 * 1024);
if (CONFIG_SYS_DDR_SIZE != msize) {
for (ddr_size = msize << 20, ddr_size_log2 = 0;
(ddr_size > 1); ddr_size = ddr_size >> 1, ddr_size_log2++)
if (ddr_size & 1)
return -1;
im->sysconf.ddrlaw[0].ar =
LAWAR_EN | ((ddr_size_log2 - 1) & LAWAR_SIZE);
im->ddr.csbnds[0].csbnds = (((msize / 16) - 1) & 0xff);
}
return msize; return msize;
} }

4
include/configs/kmeter1.h
View File

@ -92,8 +92,8 @@
* Manually set up DDR parameters * Manually set up DDR parameters
*/ */
#define CONFIG_DDR_II #define CONFIG_DDR_II
#define CONFIG_SYS_DDR_SIZE 256 /* MB */ #define CONFIG_SYS_DDR_SIZE 2048 /* MB */
#define CONFIG_SYS_DDR_CS0_BNDS 0x0000000f #define CONFIG_SYS_DDR_CS0_BNDS 0x0000007f
#define CONFIG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN | CSCONFIG_AP | \ #define CONFIG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN | CSCONFIG_AP | \
CSCONFIG_ROW_BIT_13 | \ CSCONFIG_ROW_BIT_13 | \
CSCONFIG_COL_BIT_10 | CSCONFIG_ODT_WR_ACS) CSCONFIG_COL_BIT_10 | CSCONFIG_ODT_WR_ACS)