[Buildroot] [PATCH v2 5/6] boot/at91bootstrap3: find the memory@ node of Linux device trees

[Angelo Compagnucci <angelo.compagnucci@gmail.com>]

Before booting Linux, at91bootstrap 3.x sets the memory node of its
device tree, which it looks for by the name "memory": the Linux device
trees name it memory@<address> (e.g. memory@20000000 in
at91-ariettag25.dts), and at91bootstrap stops before booting:

  DT: doesn't support add node (memory)
  SD/MMC: Failed to load image

Backport the fix of the 4.x series.

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
Changes v1 -> v2:
  - new patch
---
 ...w-name-of-memory-node-in-device-tree.patch | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 boot/at91bootstrap3/v3.10.4/0002-lib-fdt-adapt-new-name-of-memory-node-in-device-tree.patch

diff --git a/boot/at91bootstrap3/v3.10.4/0002-lib-fdt-adapt-new-name-of-memory-node-in-device-tree.patch b/boot/at91bootstrap3/v3.10.4/0002-lib-fdt-adapt-new-name-of-memory-node-in-device-tree.patch
new file mode 100644
index 0000000000..ef6f5e14b3
--- /dev/null
+++ b/boot/at91bootstrap3/v3.10.4/0002-lib-fdt-adapt-new-name-of-memory-node-in-device-tree.patch
@@ -0,0 +1,31 @@
+From 72da9d23ed07bbfc793d767dc5a4044cc0a95706 Mon Sep 17 00:00:00 2001
+From: Xing Chen <xing.chen@microchip.com>
+Date: Fri, 24 Sep 2021 10:47:35 +0800
+Subject: [PATCH] lib: fdt: adapt new name of memory node in device tree file
+
+The name of memory node was changed from 'memory' to 'memory@address'
+in device tree files in Linux. For example, 'memory@20000000' .
+This commit checks if the memory node is named 'memory' or it has a trailing
+'@' .
+
+Signed-off-by: Xing Chen <xing.chen@microchip.com>
+Upstream: https://github.com/linux4sam/at91bootstrap/commit/72da9d23ed07bbfc793d767dc5a4044cc0a95706
+Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+---
+ lib/fdt.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/fdt.c b/lib/fdt.c
+index 8d1fdfdc5..aa20426c9 100644
+--- a/lib/fdt.c
++++ b/lib/fdt.c
+@@ -254,7 +254,8 @@ static int of_get_node_offset(void *blob, const char *name, int *offset)
+ 
+ 		nodename = (char *)of_dt_struct_offset(blob,(nodeoffset + 4));
+ 		if ((memcmp(nodename, name, namelen) == 0)
+-			&& (nodename[namelen] == '\0'))
++			&& ((nodename[namelen] == '\0')
++				|| (nodename[namelen] == '@')))
+ 			break;
+ 
+ 		start_offset = nextoffset;
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot