Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix condition where bootm_size not set and wrong memory size reported

Browse source 
If the user sets bootm_low and does not set bootm_size, u-boot will
report the memory node in the flat device tree incorrectly. Instead
of reporting the remaining size of memory, it will report the total
available memory which is incorrect.

Specifically this fixes the situation when booting a relocatable
kernel and the memory is reported as an offset and size in the
device tree, and the size needs to be adjusted accordingly.

Signed-off-by: Matthew McClintock <msm@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Matthew McClintock 2010-07-08 10:11:08 -05:00 committed by Wolfgang Denk
parent b1f95b4438
commit c519facc64
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/image.c
View file

@ -433,17 +433,23 @@ ulong getenv_bootm_low(void)
phys_size_t getenv_bootm_size(void)
{
phys_size_t tmp;
char *s = getenv ("bootm_size");
if (s) {
phys_size_t tmp;
tmp = (phys_size_t)simple_strtoull (s, NULL, 16);
return tmp;
}
s = getenv("bootm_low");
if (s)
tmp = (phys_size_t)simple_strtoull (s, NULL, 16);
else
tmp = 0;
#if defined(CONFIG_ARM)
return gd->bd->bi_dram[0].size;
return gd->bd->bi_dram[0].size - tmp;
#else
return gd->bd->bi_memsize;
return gd->bd->bi_memsize - tmp;
#endif
}