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

OMAP3: Update SDRC dram_init to always call make_cs1_contiguous()

Browse Source 
We update the comment in make_cs1_contiguous() to be a little bit
more clear (it's been copy/pasted from other silicons) and then
explain in dram_init() why we need to always try this.

Note that in the previous behavior we were always calling this on
boards that never had cs1 populated anyhow so making sure we do
this always is fine and will correct things like omap3evm detecting
an invalid amount of memory (384MB).

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2011-11-18 12:47:59 +00:00 committed by Albert ARIBAUD
parent b7eb9e7895
commit 5f862b7179
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/cpu/armv7/omap3/sdrc.c
View File

@ -58,10 +58,9 @@ u32 is_mem_sdr(void)
/* /*
* make_cs1_contiguous - * make_cs1_contiguous -
* - For es2 and above remap cs1 behind cs0 to allow command line * - When we have CS1 populated we want to have it mapped after cs0 to allow
* mem=xyz use all memory with out discontinuous support compiled in. * command line mem=xyz use all memory with out discontinuous support
* Could do it at the ATAG, but there really is two banks... * compiled in. We could do it in the ATAG, but there really is two banks...
* - Called as part of 2nd phase DDR init.
*/ */
void make_cs1_contiguous(void) void make_cs1_contiguous(void)
{ {
@ -207,16 +206,16 @@ int dram_init(void)
size0 = get_sdr_cs_size(CS0); size0 = get_sdr_cs_size(CS0);
/* /*
* If a second bank of DDR is attached to CS1 this is * We always need to have cs_cfg point at where the second
* where it can be started. Early init code will init * bank would be, if present. Failure to do so can lead to
* memory on CS0. * strange situations where memory isn't detected and
* configured correctly. CS0 will already have been setup
* at this point.
*/ */
if ((sysinfo.mtype == DDR_COMBO) || (sysinfo.mtype == DDR_STACKED)) {
do_sdrc_init(CS1, NOT_EARLY);
make_cs1_contiguous(); make_cs1_contiguous();
do_sdrc_init(CS1, NOT_EARLY);
size1 = get_sdr_cs_size(CS1); size1 = get_sdr_cs_size(CS1);
}
gd->ram_size = size0 + size1; gd->ram_size = size0 + size1;
return 0; return 0;