diff options
| author | Tom Rini <trini@konsulko.com> | 2025-02-11 18:09:05 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-02-11 18:09:05 -0600 |
| commit | 87dec3078a0a36d2e6da7602b9a750010c2d111d (patch) | |
| tree | 1f18e43f1a5a6e32dd4f0319cf58a5cfc3fbdf91 /common/bloblist.c | |
| parent | b4df7003dfd06da630c248c958993a686fb1619b (diff) | |
| parent | 42aebf0f987798599b5f2d2ca6098a775bb9f448 (diff) | |
Merge patch series "Enable bloblist support on Vexpress64"
Harrison Mutai <harrison.mutai@arm.com> says:
This series of patches enhances the vexpress64 platform by enabling bloblist
support. It also introduces support for CONFIG_BLOBLIST_PASSAGE. This is
necessary to boot vexpress64 and other boards without manually specifying a
fixed address and size for the bloblist.
After this change, all the bloblist init modes are supported (i.e., fixed,
alloc, passage) and Vexpress64 boots with CONFIG_BLOBLIST_PASSAGE.
Link: https://lore.kernel.org/r/20250204175844.19890-1-harrison.mutai@arm.com
Diffstat (limited to 'common/bloblist.c')
| -rw-r--r-- | common/bloblist.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/common/bloblist.c b/common/bloblist.c index ab48a3cdb98..31ba0311090 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -488,6 +488,9 @@ int bloblist_reloc(void *to, uint to_size) { struct bloblist_hdr *hdr; + if (!to_size) + return 0; + if (to_size < gd->bloblist->total_size) return -ENOSPC; @@ -518,13 +521,6 @@ int bloblist_init(void) * at a fixed address. */ bool from_addr = fixed && !xpl_is_first_phase(); - /* - * If U-Boot is in the first phase that an arch custom routine should - * install the bloblist passed from previous loader to this fixed - * address. - */ - bool from_boot_arg = fixed && xpl_is_first_phase(); - if (xpl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST)) from_addr = false; if (fixed) @@ -532,7 +528,13 @@ int bloblist_init(void) CONFIG_BLOBLIST_ADDR); size = CONFIG_BLOBLIST_SIZE; - if (from_boot_arg) + + /* + * If the current boot stage is the first phase of U-Boot, then an + * architecture-specific routine should be used to handle the bloblist + * passed from the previous boot loader + */ + if (xpl_is_first_phase() && !IS_ENABLED(CONFIG_BLOBLIST_ALLOC)) ret = xferlist_from_boot_arg(addr, size); else if (from_addr) ret = bloblist_check(addr, size); |