diff options
| author | Simon Glass <[email protected]> | 2025-01-26 11:43:28 -0700 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-02-03 16:01:36 -0600 |
| commit | f4415f2a375c6dab4b8b20a40d4c7ec15f1e951e (patch) | |
| tree | 315c0e3b4159f1759500925f26cced1e3dd5638e /common | |
| parent | 39a9b033ceeca65b45917094cc9099a610f0185e (diff) | |
vbe: Allow VBE to disable adding loadables to the FDT
When VBE operates within VPL it does not want the FDT to be changed.
Provide a way to disable this feature.
Move the FIT_IMAGE_TINY condition out of spl_fit_record_loadable() so
that both conditions are together. This makes the code easier to
understand.
Replace the existing fit_loaded member, which is no-longer used.
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_fit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index cc2a7d34480..49b4df60560 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -515,9 +515,6 @@ static int spl_fit_record_loadable(const struct spl_fit_info *ctx, int index, const char *name; int node; - if (CONFIG_IS_ENABLED(FIT_IMAGE_TINY)) - return 0; - ret = spl_fit_get_image_name(ctx, "loadables", index, &name); if (ret < 0) return ret; @@ -863,7 +860,8 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, spl_image->entry_point = image_info.entry_point; /* Record our loadables into the FDT */ - if (spl_image->fdt_addr) + if (!CONFIG_IS_ENABLED(FIT_IMAGE_TINY) && + xpl_get_fdt_update(info) && spl_image->fdt_addr) spl_fit_record_loadable(&ctx, index, spl_image->fdt_addr, &image_info); |