From: Sascha Hauer <s.hauer@pengutronix.de> To: Barebox List <barebox@lists.infradead.org> Subject: [PATCH 11/18] overlay: Add of_overlay_apply_file() Date: Thu, 24 Jun 2021 10:52:16 +0200 [thread overview] Message-ID: <20210624085223.14616-12-s.hauer@pengutronix.de> (raw) In-Reply-To: <20210624085223.14616-1-s.hauer@pengutronix.de> A shortcut to of_overlay_apply_tree() which takes a filename rather than an unflattened device tree. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/of/overlay.c | 38 ++++++++++++++++++++++++++++++++++++++ include/of.h | 7 +++++++ 2 files changed, 45 insertions(+) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 8f4ee3f0a2..f238b39ff1 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -11,6 +11,11 @@ #include <common.h> #include <of.h> #include <errno.h> +#include <globalvar.h> +#include <magicvar.h> +#include <string.h> +#include <libfile.h> +#include <fs.h> static struct device_node *find_target(struct device_node *root, struct device_node *fragment) @@ -191,6 +196,39 @@ int of_overlay_apply_tree(struct device_node *root, return err; } +int of_overlay_apply_file(struct device_node *root, const char *filename) +{ + void *fdt; + struct device_node *ovl; + size_t size; + int ret; + + ret = read_file_2(filename, &size, &fdt, FILESIZE_MAX); + if (ret) + return ret; + + ovl = of_unflatten_dtb(fdt, size); + + free(fdt); + + if (IS_ERR(ovl)) { + pr_err("Failed to unflatten %s: %pe\n", filename, ovl); + return PTR_ERR(ovl); + } + + ret = of_overlay_apply_tree(root, ovl); + if (ret == -ENODEV) + pr_debug("Not applied %s (not compatible)\n", filename); + else if (ret) + pr_err("Cannot apply %s: %s\n", filename, strerror(-ret)); + else + pr_info("Applied %s\n", filename); + + of_delete_node(ovl); + + return ret; +} + static int of_overlay_fixup(struct device_node *root, void *data) { struct device_node *overlay = data; diff --git a/include/of.h b/include/of.h index b22996901f..9213d4165b 100644 --- a/include/of.h +++ b/include/of.h @@ -1027,6 +1027,7 @@ struct device_node *of_resolve_phandles(struct device_node *root, const struct device_node *overlay); int of_overlay_apply_tree(struct device_node *root, struct device_node *overlay); +int of_overlay_apply_file(struct device_node *root, const char *filename); int of_register_overlay(struct device_node *overlay); int of_process_overlay(struct device_node *root, struct device_node *overlay, @@ -1048,6 +1049,12 @@ static inline int of_overlay_apply_tree(struct device_node *root, return -ENOSYS; } +static inline int of_overlay_apply_file(struct device_node *root, + const char *filename) +{ + return -ENOSYS; +} + static inline int of_register_overlay(struct device_node *overlay) { return -ENOSYS; -- 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:57 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 ` [PATCH 10/18] blspec: Set firmware searchpath Sascha Hauer 2021-06-24 8:52 ` Sascha Hauer [this message] 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-12-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH 11/18] overlay: Add of_overlay_apply_file()' \ /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