aboutsummaryrefslogtreecommitdiff
path: root/common/image.c
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2010-07-08 10:11:08 -0500
committerWolfgang Denk <wd@denx.de>2010-08-07 21:55:03 +0200
commitc519facc645812c6d174c2d5b60241d23e285642 (patch)
treef6cb0d7cc2bc179d9a82607e6ac52a1b6d90c37b /common/image.c
parentb1f95b4438a6d44e12f04e7f51412f7a711ef87b (diff)
downloadu-boot-linaro-natty-c519facc645812c6d174c2d5b60241d23e285642.tar.gz
Fix condition where bootm_size not set and wrong memory size reported
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>
Diffstat (limited to 'common/image.c')
-rw-r--r--common/image.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/common/image.c b/common/image.c
index 6d8833e81..ea5973086 100644
--- a/common/image.c
+++ b/common/image.c
@@ -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
}