diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-05 22:42:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-05 22:42:07 -0500 |
| commit | 6c56bd31b7c11c1f4e97bf6bd1db9f48e35ec10b (patch) | |
| tree | d1d2b1c7bc2e31a33e65b769e464cb23e8aac22e /common/board_f.c | |
| parent | f89615088fba1b1f33713ad26dbe3a3c82b692ec (diff) | |
| parent | c229cd2b6e443a1365ff5089c4c4a6440f218dce (diff) | |
Merge tag 'dm-pull-5dec21a' of https://source.denx.de/u-boot/custodians/u-boot-dm into next
binman refactoring to improve section handling
bloblist - allow it to be allocated
sandbox config-header cleanup
# gpg: Signature made Sun 05 Dec 2021 10:14:24 PM EST
# gpg: using RSA key B25C0022AF86A7CC1655B6277F173A3E9008ADE6
# gpg: issuer "sjg@chromium.org"
# gpg: Good signature from "Simon Glass <sjg@chromium.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B25C 0022 AF86 A7CC 1655 B627 7F17 3A3E 9008 ADE6
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index f7ea7c7a1e..dd69c3b6b7 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -655,8 +655,14 @@ static int reloc_bootstage(void) static int reloc_bloblist(void) { #ifdef CONFIG_BLOBLIST - if (gd->flags & GD_FLG_SKIP_RELOC) + /* + * Relocate only if we are supposed to send it + */ + if ((gd->flags & GD_FLG_SKIP_RELOC) && + CONFIG_BLOBLIST_SIZE == CONFIG_BLOBLIST_SIZE_RELOC) { + debug("Not relocating bloblist\n"); return 0; + } if (gd->new_bloblist) { int size = CONFIG_BLOBLIST_SIZE; |