Currently, barebox only parse one memory node which is either the
"/memory" node or the first node with device_type == "memory".
However, the use of multiple memory nodes with device_type = "memory"
property is allowed by the device tree specification and already
correctly parsed by Linux kernel.
In order to fix that, add of_probe_memory function which loop over all
available memory nodes matching device_type == "memory".
Signed-off-by: Clement Leger <cleger@xxxxxxxxx>
---
drivers/of/base.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 2ea8d7516..6d13b66a0 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2062,9 +2062,23 @@ const struct of_device_id of_default_bus_match_table[] = {
}
};
+static void of_probe_memory(void)
+{
+ struct device_node *memory = root_node;
+
+ /* Parse all available node with "memory" device_type */
+ while (1) {
+ memory = of_find_node_by_type(memory, "memory");
+ if (!memory)
+ break;
+
+ of_add_memory(memory, false);
+ }
+}
+
int of_probe(void)
{
- struct device_node *memory, *firmware;
+ struct device_node *firmware;
if(!root_node)
return -ENODEV;
@@ -2075,11 +2089,7 @@ int of_probe(void)
if (of_model)
barebox_set_model(of_model);
- memory = of_find_node_by_path("/memory");
- if (!memory)
- memory = of_find_node_by_type(root_node, "memory");
- if (memory)
- of_add_memory(memory, false);
+ of_probe_memory();
firmware = of_find_node_by_path("/firmware");
if (firmware)
--
2.17.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
