Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"

This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing
changes made to 56d37f1c564107e27d873181d838571b7d7860e7.

Unfortunately this is causing CI failures:
https://travis-ci.org/github/trini/u-boot/jobs/711313649

Signed-off-by: Tom Rini <trini@konsulko.com>

2 files changed, 2 insertions, 19 deletions

diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index d058c59e92..188490b728 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -207,8 +207,7 @@ class Prop:
             if auto_resize:
                 while fdt_obj.setprop(node.Offset(), self.name, self.bytes,
                                     (libfdt.NOSPACE,)) == -libfdt.NOSPACE:
-                    fdt_obj.resize(fdt_obj.totalsize() + 1024 +
-                                   len(self.bytes))
+                    fdt_obj.resize(fdt_obj.totalsize() + 1024)
                     fdt_obj.setprop(node.Offset(), self.name, self.bytes)
             else:
                 fdt_obj.setprop(node.Offset(), self.name, self.bytes)
@@ -411,18 +410,6 @@ class Node:
             val = val.encode('utf-8')
         self._CheckProp(prop_name).props[prop_name].SetData(val + b'\0')
 
-    def AddData(self, prop_name, val):
-        """Add a new property to a node
-
-        The device tree is marked dirty so that the value will be written to
-        the blob on the next sync.
-
-        Args:
-            prop_name: Name of property to add
-            val: Bytes value of property
-        """
-        self.props[prop_name] = Prop(self, None, prop_name, val)
-
     def AddString(self, prop_name, val):
         """Add a new string property to a node
 
@@ -435,7 +422,7 @@ class Node:
         """
         if sys.version_info[0] >= 3:  # pragma: no cover
             val = bytes(val, 'utf-8')
-        self.AddData(prop_name, val + b'\0')
+        self.props[prop_name] = Prop(self, None, prop_name, val + b'\0')
 
     def AddSubnode(self, name):
         """Add a new subnode to the node
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index b4f9b7f498..375e906424 100755
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -417,10 +417,6 @@ class TestProp(unittest.TestCase):
         self.node.SetData('empty', b'123')
         self.assertEqual(b'123', prop.bytes)
 
-        # Trying adding a lot of data at once
-        self.node.AddData('data', tools.GetBytes(65, 20000))
-        self.dtb.Sync(auto_resize=True)
-
     def testFromData(self):
         dtb2 = fdt.Fdt.FromData(self.dtb.GetContents())
         self.assertEqual(dtb2.GetContents(), self.dtb.GetContents())