diff options
| author | Tom Rini <[email protected]> | 2024-12-18 12:34:58 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-12-18 15:19:16 -0600 |
| commit | b6e1ac89dc0a9d9bba1b803d4577f434669ce44e (patch) | |
| tree | dfbf6aa2fd3a9af4d7900f929d06ea753b009670 /lib | |
| parent | b066ac51e0430966d8028bcdfa12f461d9013f57 (diff) | |
| parent | fc37a73e667916e15e01e0f9d189da792df2b351 (diff) | |
Merge patch series "fdt: Correct condition for receiving bloblist"
This series is from Simon Glass <[email protected]>.
It first corrects the test for checking if a bloblist could have come
from TPL and so we check for a device tree, and then changes the
argument order for board_fdt_blob_setup() to be more inline with our
usual argument ordering.
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index b0655988029..c5d29d4385a 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1677,7 +1677,7 @@ int fdtdec_setup(void) */ if (CONFIG_IS_ENABLED(BLOBLIST) && (xpl_prev_phase() != PHASE_TPL || - !IS_ENABLED(CONFIG_TPL_BLOBLIST))) { + IS_ENABLED(CONFIG_TPL_BLOBLIST))) { ret = bloblist_maybe_init(); if (!ret) { gd->fdt_blob = bloblist_find(BLOBLISTT_CONTROL_FDT, 0); @@ -1706,11 +1706,17 @@ int fdtdec_setup(void) /* Allow the board to override the fdt address. */ if (IS_ENABLED(CONFIG_OF_BOARD)) { - gd->fdt_blob = board_fdt_blob_setup(&ret); - if (!ret) + void *blob; + + blob = (void *)gd->fdt_blob; + ret = board_fdt_blob_setup(&blob); + if (ret) { + if (ret != -EEXIST) + return ret; + } else { gd->fdt_src = FDTSRC_BOARD; - else if (ret != -EEXIST) - return ret; + gd->fdt_blob = blob; + } } /* Allow the early environment to override the fdt address */ |