diff options
| author | Alexey Brodkin <[email protected]> | 2018-05-25 16:08:14 +0300 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-06-05 20:19:08 -0400 |
| commit | ff2b2ba845ee682b5eafe4abbb9adbf48730af4b (patch) | |
| tree | fdb50ed162a72442b24487bb75e4031e90894849 /common | |
| parent | 0899bd269e8ca0a0c7e6afe9287366bc067c141c (diff) | |
board_f: Only reserve memory for U-Boot if we're going to relocate
In case of no relocation we'll just waste some space at the very end
of usable memory area. If target device has very limited amount of memory
(for example 256 kB) this loss will be pretty inconvenient.
Signed-off-by: Alexey Brodkin <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Cc: Bin Meng <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: York Sun <[email protected]>
Cc: Stefan Roese <[email protected]>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/common/board_f.c b/common/board_f.c index fa667c764bc..e943347ce3d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -394,19 +394,21 @@ static int reserve_trace(void) static int reserve_uboot(void) { - /* - * reserve memory for U-Boot code, data & bss - * round down to next 4 kB limit - */ - gd->relocaddr -= gd->mon_len; - gd->relocaddr &= ~(4096 - 1); -#if defined(CONFIG_E500) || defined(CONFIG_MIPS) - /* round down to next 64 kB limit so that IVPR stays aligned */ - gd->relocaddr &= ~(65536 - 1); -#endif - - debug("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10, - gd->relocaddr); + if (!(gd->flags & GD_FLG_SKIP_RELOC)) { + /* + * reserve memory for U-Boot code, data & bss + * round down to next 4 kB limit + */ + gd->relocaddr -= gd->mon_len; + gd->relocaddr &= ~(4096 - 1); + #if defined(CONFIG_E500) || defined(CONFIG_MIPS) + /* round down to next 64 kB limit so that IVPR stays aligned */ + gd->relocaddr &= ~(65536 - 1); + #endif + + debug("Reserving %ldk for U-Boot at: %08lx\n", + gd->mon_len >> 10, gd->relocaddr); + } gd->start_addr_sp = gd->relocaddr; |