projects
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
96d66a9
bac9da4
)
Merge branch 'remove-config-nr-dram-banks-v9-2020-08-26' of https://gitlab.denx.de...
author
Tom Rini
<trini@konsulko.com>
Mon, 7 Sep 2020 18:31:00 +0000
(14:31 -0400)
committer
Tom Rini
<trini@konsulko.com>
Mon, 7 Sep 2020 18:31:00 +0000
(14:31 -0400)
1
2
common/image.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
common/image.c
index
da8bccd
,
6f68b13
..
645bfef
---
1
/
common/image.c
---
2
/
common/image.c
+++ b/
common/image.c
@@@
-685,18
-685,9
+685,12
@@@
phys_size_t env_get_bootm_size(void
return tmp;
}
- #if (defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE)) && \
- defined(CONFIG_NR_DRAM_BANKS)
- start = gd->bd->bi_dram[0].start;
- size = gd->bd->bi_dram[0].size;
- #else
- start = gd->bd->bi_memstart;
- size = gd->bd->bi_memsize;
- #endif
+ start = gd->ram_base;
+ size = gd->ram_size;
+ if (start + size > gd->ram_top)
+ size = gd->ram_top - start;
+
s = env_get("bootm_low");
if (s)
tmp = (phys_size_t)simple_strtoull(s, NULL, 16);