From: Sascha Hauer <s.hauer@pengutronix.de> To: Barebox List <barebox@lists.infradead.org> Subject: [PATCH 10/18] blspec: Set firmware searchpath Date: Thu, 24 Jun 2021 10:52:15 +0200 [thread overview] Message-ID: <20210624085223.14616-11-s.hauer@pengutronix.de> (raw) In-Reply-To: <20210624085223.14616-1-s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> --- common/blspec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/common/blspec.c b/common/blspec.c index 056c0dbf7f..c39805cb0b 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,20 @@ 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(); + if (old_fws && *old_fws) + fws = basprintf("%s/lib/firmware:%s", abspath, old_fws); + else + fws = basprintf("%s/lib/firmware", abspath); + 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 barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-06-24 8:54 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-24 8:52 [PATCH v3 00/18] Apply device tree overlays to kernel tree Sascha Hauer 2021-06-24 8:52 ` [PATCH 01/18] of: of_copy_node(): Copy phandles as well Sascha Hauer 2021-06-24 8:52 ` [PATCH 02/18] of: Add function to duplicate a device tree Sascha Hauer 2021-06-24 8:52 ` [PATCH 03/18] fdt: Check blob size during unflattening Sascha Hauer 2021-06-24 8:52 ` [PATCH 04/18] firmware: make device_node argument non const Sascha Hauer 2021-06-24 8:52 ` [PATCH 05/18] libbb: Add find_path function Sascha Hauer 2021-06-24 8:52 ` [PATCH 06/18] firmware: consolidate ifdefs Sascha Hauer 2021-06-24 8:52 ` [PATCH 07/18] firmware: Add search path Sascha Hauer 2021-06-24 8:52 ` [PATCH 08/18] firmware: Fix device_node matching Sascha Hauer 2021-06-24 8:52 ` [PATCH 09/18] firmware: recognize by reproducible name Sascha Hauer 2021-06-24 8:52 ` Sascha Hauer [this message] 2021-06-24 8:52 ` [PATCH 11/18] overlay: Add of_overlay_apply_file() Sascha Hauer 2021-06-24 8:52 ` [PATCH 12/18] firmware: Load from global search path Sascha Hauer 2021-06-24 8:52 ` [PATCH 13/18] blspec: Rework firmware load Sascha Hauer 2021-06-24 8:52 ` [PATCH 14/18] overlay: Add filters to choose which overlays to apply Sascha Hauer 2021-06-28 18:58 ` Michael Riesch 2021-06-28 20:13 ` Sascha Hauer 2021-06-24 8:52 ` [PATCH 15/18] blspec: Apply overlays from rootfs Sascha Hauer 2021-06-24 8:52 ` [PATCH 16/18] doc: devicetree: Refer to internal device tree also as live tree Sascha Hauer 2021-06-24 8:52 ` [PATCH 17/18] Documentation: Add documentation for device tree overlays Sascha Hauer 2021-06-24 8:52 ` [PATCH 18/18] of_firmware: Fix handling of firmware-name property Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210624085223.14616-11-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH 10/18] blspec: Set firmware searchpath' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox