Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

integrator: do not test first part of the memory

Browse source 
When booting from Flash, the Integrator remaps its flash memory
from 0x24000000 to 0x00000000, and starts executing it at
0x00000000. This ROM thus hides the RAM underneath and first
0x40000 bytes of the memory cannot be tested by get_ram_size().
So let's test from 0x40000 to the end of detected memory
instead.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2011-10-23 21:02:03 +00:00 committed by Albert ARIBAUD
parent 60d1ea94ea
commit 46b5ccbfe2
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
board/armltd/integrator/integrator.c
View file

@ -86,6 +86,15 @@ int misc_init_r (void)
return (0); return (0);
} }
/*
* The Integrator remaps the Flash memory to 0x00000000 and executes U-Boot
* from there, which means we cannot test the RAM underneath the ROM at this
* point. It will be unmapped later on, when we are executing from the
* relocated in RAM U-Boot. We simply assume that this RAM is usable if the
* RAM on higher addresses works fine.
*/
#define REMAPPED_FLASH_SZ 0x40000
int dram_init (void) int dram_init (void)
{ {
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
@ -111,15 +120,17 @@ extern void dram_query(void);
* *
*/ */
sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4; sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4;
gd->bd->bi_dram[0].size = 0x01000000 << sdram_shift; gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, REMAPPED_FLASH_SZ,
0x01000000 << sdram_shift); 0x01000000 << sdram_shift);
} }
#else #else
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, REMAPPED_FLASH_SZ,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
#endif /* CM_SPD_DETECT */ #endif /* CM_SPD_DETECT */
/* We only have one bank of RAM, set it to whatever was detected */
gd->bd->bi_dram[0].size = gd->ram_size;
return 0; return 0;
} }