binman: Rename some two-digit test files

Two of the test files somehow were not converted to three digits. Fix
them, using the next available numbers.

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

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 2e85a87e30b8d5dad62ca90682af2b650b61a764..fe3365255f14de961ba0249837fb70a377bd1949 100644 (file)
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -906,7 +906,7 @@ class TestFunctional(unittest.TestCase):
         """Test that the end-at-4gb and skip-at-size property can't be used
         together"""
         with self.assertRaises(ValueError) as e:
-            self._DoTestFile('80_4gb_and_skip_at_start_together.dts')
+            self._DoTestFile('098_4gb_and_skip_at_start_together.dts')
         self.assertIn("Image '/binman': Provide either 'end-at-4gb' or "
                       "'skip-at-start'", str(e.exception))
 
@@ -962,7 +962,7 @@ class TestFunctional(unittest.TestCase):
     def testPackPowerpcMpc85xxBootpgResetvec(self):
         """Test that an image with powerpc-mpc85xx-bootpg-resetvec can be
         created"""
-        data = self._DoReadFile('81_powerpc_mpc85xx_bootpg_resetvec.dts')
+        data = self._DoReadFile('150_powerpc_mpc85xx_bootpg_resetvec.dts')
         self.assertEqual(PPC_MPC85XX_BR_DATA, data[:len(PPC_MPC85XX_BR_DATA)])
 
     def _RunMicrocodeTest(self, dts_fname, nodtb_data, ucode_second=False):

diff --git a/tools/binman/test/098_4gb_and_skip_at_start_together.dts b/tools/binman/test/098_4gb_and_skip_at_start_together.dts
new file mode 100644 (file)
index 0000000..90c467d
--- /dev/null
+++ b/tools/binman/test/098_4gb_and_skip_at_start_together.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018 NXP
+ */
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <32>;
+               sort-by-offset;
+               end-at-4gb;
+               skip-at-start = <0xffffffe0>;
+               u-boot {
+                       offset = <0xffffffe0>;
+               };
+       };
+};

diff --git a/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts b/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts
new file mode 100644 (file)
index 0000000..8f4b16c
--- /dev/null
+++ b/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018 NXP
+ */
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               powerpc-mpc85xx-bootpg-resetvec {
+               };
+       };
+};

diff --git a/tools/binman/test/80_4gb_and_skip_at_start_together.dts b/tools/binman/test/80_4gb_and_skip_at_start_together.dts
deleted file mode 100644 (file)
index 90c467d..0000000
--- a/tools/binman/test/80_4gb_and_skip_at_start_together.dts
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2018 NXP
- */
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <32>;
-               sort-by-offset;
-               end-at-4gb;
-               skip-at-start = <0xffffffe0>;
-               u-boot {
-                       offset = <0xffffffe0>;
-               };
-       };
-};

diff --git a/tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts b/tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts
deleted file mode 100644 (file)
index 8f4b16c..0000000
--- a/tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2018 NXP
- */
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               powerpc-mpc85xx-bootpg-resetvec {
-               };
-       };
-};