From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i5pMg-00074g-K4 for barebox@lists.infradead.org; Thu, 05 Sep 2019 10:51:49 +0000 From: Michael Tretter Date: Thu, 5 Sep 2019 12:51:41 +0200 Message-Id: <20190905105142.13681-7-m.tretter@pengutronix.de> In-Reply-To: <20190905105142.13681-1-m.tretter@pengutronix.de> References: <20190905105142.13681-1-m.tretter@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 6/7] blspec: load firmware if specified in dt overlay To: barebox@lists.infradead.org Cc: Michael Tretter If a device tree overlay referenced by the blspec depends on firmware, try to load the firmware from the default Linux firmware search path /lib/firmware in the about to be started rootfs. Signed-off-by: Michael Tretter --- common/blspec.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/common/blspec.c b/common/blspec.c index 6b15d36d67..d6f9337d9c 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -49,6 +50,7 @@ static int blspec_apply_oftree_overlay(char *file, const char *abspath, struct fdt_header *fdt; struct device_node *overlay; char *path; + char *firmware_path; path = basprintf("%s/%s", abspath, file); @@ -72,6 +74,20 @@ static int blspec_apply_oftree_overlay(char *file, const char *abspath, goto out; } + /* + * Unfortunately the device tree overlay contains only the filename of + * the firmware and relies on the firmware search paths to find the + * actual file. Use /lib/firmware in the Linux root directory and hope + * for the best. + */ + firmware_path = basprintf("%s/%s", abspath, "/lib/firmware"); + ret = firmware_load_overlay(overlay, firmware_path); + free(firmware_path); + if (ret) { + of_delete_node(overlay); + goto out; + } + ret = of_register_overlay(overlay); if (ret) pr_warn("cannot register devicetree overlay \"%s\"\n", path); -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox