diff options
author | Tom Rini <trini@konsulko.com> | 2021-11-18 18:25:19 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-11-18 18:25:19 -0500 |
commit | 8391a0f3d97c0300d7eafe7581b6712afb18f283 (patch) | |
tree | 750049c4c588dc1da71a290a4cdd5b0d44209a5f /lib/lmb.c | |
parent | 3144ba23bf4649f699078259fdf2e5cb4eab8f53 (diff) | |
parent | b1f3f982fa1cdcf08717a37e00adcb6fc3d89bf4 (diff) |
Merge branch '2021-11-18-regression-fixes'
- An assortment of fixes related to GD, GD_FLG_SKIP_RELOC, and the lmb
- Environment fix on synquacer developmentbox
- Fix for get_info is not valid in partition code
Diffstat (limited to 'lib/lmb.c')
-rw-r--r-- | lib/lmb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/lmb.c b/lib/lmb.c index 676b3a0bda6..f72996a4248 100644 --- 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; } } |