]> git.baikalelectronics.ru Git - uboot.git/commitdiff
binman: Use a unique number for the symbols test file
authorSimon Glass <sjg@chromium.org>
Sun, 21 Mar 2021 05:24:29 +0000 (18:24 +1300)
committerSimon Glass <sjg@chromium.org>
Sat, 27 Mar 2021 03:26:48 +0000 (16:26 +1300)
Two test devicetree files currently have 192 as their unique number. Fix
this by separating them out.

Signed-off-by: Simon Glass <sjg@chromium.org>
tools/binman/ftest.py
tools/binman/test/192_symbols_nodtb.dts [deleted file]
tools/binman/test/196_symbols_nodtb.dts [new file with mode: 0644]

index 81c213a908a80508891b5d27d722e025dbf810f9..34449553ca0d31b6f88265038541acdb3920c26b 100644 (file)
@@ -1377,7 +1377,7 @@ class TestFunctional(unittest.TestCase):
 
     def testSymbolsNoDtb(self):
         """Test binman can assign symbols embedded in U-Boot SPL"""
-        self.checkSymbols('192_symbols_nodtb.dts',
+        self.checkSymbols('196_symbols_nodtb.dts',
                           U_BOOT_SPL_NODTB_DATA + U_BOOT_SPL_DTB_DATA,
                           0x38)
 
diff --git a/tools/binman/test/192_symbols_nodtb.dts b/tools/binman/test/192_symbols_nodtb.dts
deleted file mode 100644 (file)
index 5c900d6..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               pad-byte = <0xff>;
-               u-boot-spl-nodtb {
-               };
-               u-boot-spl-dtb {
-               };
-
-               u-boot {
-                       offset = <0x38>;
-               };
-
-               u-boot-spl2 {
-                       type = "u-boot-spl-nodtb";
-               };
-               u-boot-spl-dtb2 {
-                       type = "u-boot-spl-dtb";
-               };
-       };
-};
diff --git a/tools/binman/test/196_symbols_nodtb.dts b/tools/binman/test/196_symbols_nodtb.dts
new file mode 100644 (file)
index 0000000..5c900d6
--- /dev/null
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               pad-byte = <0xff>;
+               u-boot-spl-nodtb {
+               };
+               u-boot-spl-dtb {
+               };
+
+               u-boot {
+                       offset = <0x38>;
+               };
+
+               u-boot-spl2 {
+                       type = "u-boot-spl-nodtb";
+               };
+               u-boot-spl-dtb2 {
+                       type = "u-boot-spl-dtb";
+               };
+       };
+};