diff options
| author | Tom Rini <[email protected]> | 2024-03-13 18:47:16 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-03-13 18:47:16 -0400 |
| commit | 3987e15e88a1d6a9a211b7637728fcc0acf74fbe (patch) | |
| tree | 5259b77db728b368c4900579c2d44337ae6de9e7 /boot | |
| parent | 213ffd49bdbd30512661eaf47b7445ef8a81bcdb (diff) | |
| parent | 969ea37dfd04e2800828fe2a26cd354d22569d18 (diff) | |
Merge branch '2024-04-13-assorted-fixes' into next
- Fix bootm_low handling, CONFIG_64BIT usage fixes, RNG fixes, cli
history fixes, allow bootelf to pass a device tree address, other
assorted fixes.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/image-fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 75bdd55f326..5e4aa9de0d2 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -217,14 +217,14 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) if (start + size < low) continue; - usable = min(size, (u64)mapsize); + usable = min(start + size, (u64)(low + mapsize)); /* * At least part of this DRAM bank is usable, try * using it for LMB allocation. */ of_start = map_sysmem((ulong)lmb_alloc_base(lmb, - of_len, 0x1000, start + usable), of_len); + of_len, 0x1000, usable), of_len); /* Allocation succeeded, use this block. */ if (of_start != NULL) break; |