]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
lmb: Reserve U-Boot separately if relocation is disabled
authorMarek Vasut <marek.vasut+renesas@gmail.com>
Sat, 13 Nov 2021 17:34:37 +0000 (18:34 +0100)
committerTom Rini <trini@konsulko.com>
Thu, 18 Nov 2021 23:20:19 +0000 (18:20 -0500)
In case U-Boot starts with GD_FLG_SKIP_RELOC, the U-Boot code is
not relocated, however the stack and heap is at the end of DRAM
after relocation. Reserve a LMB area for the non-relocated U-Boot
code so it won't be overwritten.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
lib/lmb.c

index 676b3a0bda6f0d2270c47db95c20aef686a77a5a..f72996a4248e9c0f13deb12b9cc8f941ad2b58e3 100644 (file)
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 
 #include <asm/global_data.h>
+#include <asm/sections.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -144,6 +145,10 @@ void arch_lmb_reserve_generic(struct lmb *lmb, ulong sp, ulong end, ulong align)
                        bank_end = end - 1;
 
                lmb_reserve(lmb, sp, bank_end - sp + 1);
+
+               if (gd->flags & GD_FLG_SKIP_RELOC)
+                       lmb_reserve(lmb, (phys_addr_t)(uintptr_t)_start, gd->mon_len);
+
                break;
        }
 }