diff mbox series

[U-Boot,28/29] binman: Add a test to catch use of the old 'pos' property

Message ID 20180717192552.198496-29-sjg@chromium.org
State Accepted
Commit 15a587c9cec246ec69d96fce8f146e0c835b3670
Delegated to: Simon Glass
Headers show
Series binman: Expand feature set and documentation | expand

Commit Message

Simon Glass July 17, 2018, 7:25 p.m. UTC 
This property has been changed to 'offset'. To help downstream users who
might still be using 'pos', add a check that this is not used by mistake.

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

 tools/binman/entry.py             |  2 ++
 tools/binman/ftest.py             |  7 +++++++
 tools/binman/test/79_uses_pos.dts | 10 ++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 tools/binman/test/79_uses_pos.dts
diff mbox series

Patch

diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 6ce5dbdc90..77cfab9c5d 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -143,6 +143,8 @@  class Entry(object):
 
         This reads all the fields we recognise from the node, ready for use.
         """
+        if 'pos' in self._node.props:
+            self.Raise("Please use 'offset' instead of 'pos'")
         self.offset = fdt_util.GetInt(self._node, 'offset')
         self.size = fdt_util.GetInt(self._node, 'size')
         self.align = fdt_util.GetInt(self._node, 'align')
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index ce473dfaff..3d5f23558c 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -1361,6 +1361,13 @@  class TestFunctional(unittest.TestCase):
         data = self._DoReadFile('78_u_boot_tpl.dts')
         self.assertEqual(U_BOOT_TPL_DATA + U_BOOT_TPL_DTB_DATA, data)
 
+    def testUsesPos(self):
+        """Test that the 'pos' property cannot be used anymore"""
+        with self.assertRaises(ValueError) as e:
+           data = self._DoReadFile('79_uses_pos.dts')
+        self.assertIn("Node '/binman/u-boot': Please use 'offset' instead of "
+                      "'pos'", str(e.exception))
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tools/binman/test/79_uses_pos.dts b/tools/binman/test/79_uses_pos.dts
new file mode 100644
index 0000000000..7638b9b5e0
--- /dev/null
+++ b/tools/binman/test/79_uses_pos.dts
@@ -0,0 +1,10 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+
+/ {
+	binman {
+		u-boot {
+			pos = <10>;
+		};
+	};
+};