When bootloader spec triggers dt overlay loading then this might
also trigger loading firmware. This firmware should be looked for
relative to the filesystem providing the bootloader spec files,
so add that to the firmware search path.

Signed-off-by: Sascha Hauer <[email protected]>
---
 common/blspec.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/blspec.c b/common/blspec.c
index b6f91e3114..14e3238c0f 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -122,6 +122,8 @@ static int blspec_boot(struct bootentry *be, int verbose, 
int dryrun)
        const char *abspath, *devicetree, *options, *initrd, *linuximage;
        const char *overlays;
        const char *appendroot;
+       const char *old_fws;
+       char *fws;
        struct bootm_data data = {
                .dryrun = dryrun,
        };
@@ -184,9 +186,17 @@ static int blspec_boot(struct bootentry *be, int verbose, 
int dryrun)
                        (entry->cdev && entry->cdev->dev) ?
                        dev_name(entry->cdev->dev) : "none");
 
+       old_fws = firmware_get_searchpath();
+       fws = basprintf("%s/lib/firmware:%s", abspath, old_fws);
+       firmware_set_searchpath(fws);
+       free(fws);
+
        ret = bootm_boot(&data);
        if (ret)
                pr_err("Booting failed\n");
+
+       firmware_set_searchpath(old_fws);
+
 err_out:
        free((char *)data.oftree_file);
        free((char *)data.initrd_file);
-- 
2.29.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to