[U-Boot] [PATCH 17/53] dtoc: Update Fdt.GetNode() to handle the root node

Simon Glass sjg at chromium.org
Sat Jul 20 18:23:39 UTC 2019


This function currently fails if the root node is requested. Requesting
the root node is sometimes useful, so fix the bug.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/dtoc/fdt.py      | 2 ++
 tools/dtoc/test_fdt.py | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index b341ef3f83b..cd7673c7da0 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -574,6 +574,8 @@ class Fdt:
         parts = path.split('/')
         if len(parts) < 2:
             return None
+        if len(parts) == 2 and parts[1] == '':
+            return node
         for part in parts[1:]:
             node = node.FindNode(part)
             if not node:
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index c25248ca1f9..ed2d982a8fc 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -77,11 +77,16 @@ class TestFdt(unittest.TestCase):
         """Test the GetNode() method"""
         node = self.dtb.GetNode('/spl-test')
         self.assertTrue(isinstance(node, fdt.Node))
+
         node = self.dtb.GetNode('/i2c at 0/pmic at 9')
         self.assertTrue(isinstance(node, fdt.Node))
         self.assertEqual('pmic at 9', node.name)
         self.assertIsNone(self.dtb.GetNode('/i2c at 0/pmic at 9/missing'))
 
+        node = self.dtb.GetNode('/')
+        self.assertTrue(isinstance(node, fdt.Node))
+        self.assertEqual(0, node.Offset())
+
     def testFlush(self):
         """Check that we can flush the device tree out to its file"""
         fname = self.dtb._fname
-- 
2.22.0.657.g960e92d24f-goog



More information about the U-Boot mailing list