summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-01-30 16:11:07 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-01-31 09:26:02 +0100
commitabd0cea544372324656bf35b30b4cc6cd3b80317 (patch)
tree090c8cd1bfa4d3b0628dc6746153a82242bf9547
parentfb721e3fd2380d7d0835ad6479ee3a23b528569d (diff)
downloadbarebox-abd0cea544372324656bf35b30b4cc6cd3b80317.tar.gz
barebox-abd0cea544372324656bf35b30b4cc6cd3b80317.tar.xz
of: fdt: add of_unflatten_dtb_const
This adds a variant of of_unflatten_dtb() which uses the property data directly from the input tree rather than copying it. This is mainly useful for a single user: FIT images. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/of/fdt.c36
-rw-r--r--include/of.h1
2 files changed, 35 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 614e136de6..1edb35f3d6 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -117,7 +117,7 @@ static int of_unflatten_reservemap(struct device_node *root,
* Parse a flat device tree binary blob and return a pointer to the
* unflattened tree.
*/
-struct device_node *of_unflatten_dtb(const void *infdt)
+struct device_node *__of_unflatten_dtb(const void *infdt, bool constprops)
{
const void *nodep; /* property node pointer */
uint32_t tag; /* tag */
@@ -221,7 +221,11 @@ struct device_node *of_unflatten_dtb(const void *infdt)
goto err;
}
- p = of_new_property(node, name, nodep, len);
+ if (constprops)
+ p = of_new_property_const(node, name, nodep, len);
+ else
+ p = of_new_property(node, name, nodep, len);
+
if (!strcmp(name, "phandle") && len == 4)
node->phandle = be32_to_cpup(p->value);
@@ -255,6 +259,34 @@ err:
return ERR_PTR(ret);
}
+/**
+ * of_unflatten_dtb - unflatten a dtb binary blob
+ * @infdt - the fdt blob to unflatten
+ *
+ * Parse a flat device tree binary blob and return a pointer to the unflattened
+ * tree. The tree must be freed after use with of_delete_node().
+ */
+struct device_node *of_unflatten_dtb(const void *infdt)
+{
+ return __of_unflatten_dtb(infdt, false);
+}
+
+/**
+ * of_unflatten_dtb_const - unflatten a dtb binary blob
+ * @infdt - the fdt blob to unflatten
+ *
+ * Parse a flat device tree binary blob and return a pointer to the unflattened
+ * tree. The tree must be freed after use with of_delete_node(). Unlike the
+ * above version this function uses the property data directly from the input
+ * flattened tree instead of copying the data, thus @infdt must be valid for the
+ * whole lifetime of the returned tree. This is normally not what you want, so
+ * use of_unflatten_dtb() instead.
+ */
+struct device_node *of_unflatten_dtb_const(const void *infdt)
+{
+ return __of_unflatten_dtb(infdt, true);
+}
+
struct fdt {
void *dt;
uint32_t dt_nextofs;
diff --git a/include/of.h b/include/of.h
index d3b92328a5..421e038adb 100644
--- a/include/of.h
+++ b/include/of.h
@@ -101,6 +101,7 @@ void of_print_nodes(struct device_node *node, int indent);
int of_probe(void);
int of_parse_dtb(struct fdt_header *fdt);
struct device_node *of_unflatten_dtb(const void *fdt);
+struct device_node *of_unflatten_dtb_const(const void *infdt);
struct cdev;