binman: Renumber 277_rockchip and 278_mkimage test files

These have ended up with the same numbers as earlier files. Fix them.

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

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 376af9fa0806c84a3918c2cca95720a5e1b43dd4..40d2fd5da1b670d0224fb8cf3dac4b9f369fdc12 100644 (file)
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -6683,18 +6683,18 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
 
     def testPackRockchipTpl(self):
         """Test that an image with a Rockchip TPL binary can be created"""
-        data = self._DoReadFile('277_rockchip_tpl.dts')
+        data = self._DoReadFile('291_rockchip_tpl.dts')
         self.assertEqual(ROCKCHIP_TPL_DATA, data[:len(ROCKCHIP_TPL_DATA)])
 
     def testMkimageMissingBlobMultiple(self):
         """Test missing blob with mkimage entry and multiple-data-files"""
         with test_util.capture_sys_output() as (stdout, stderr):
-            self._DoTestFile('278_mkimage_missing_multiple.dts', allow_missing=True)
+            self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=True)
         err = stderr.getvalue()
         self.assertIn("is missing external blobs and is non-functional", err)
 
         with self.assertRaises(ValueError) as e:
-            self._DoTestFile('278_mkimage_missing_multiple.dts', allow_missing=False)
+            self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=False)
         self.assertIn("not found in input path", str(e.exception))
 
     def _PrepareSignEnv(self, dts='280_fit_sign.dts'):

diff --git a/tools/binman/test/277_rockchip_tpl.dts b/tools/binman/test/277_rockchip_tpl.dts
deleted file mode 100644 (file)
index 269f56e..0000000
--- a/tools/binman/test/277_rockchip_tpl.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               rockchip-tpl {
-                       filename = "rockchip-tpl.bin";
-               };
-       };
-};

diff --git a/tools/binman/test/278_mkimage_missing_multiple.dts b/tools/binman/test/278_mkimage_missing_multiple.dts
deleted file mode 100644 (file)
index f84aea4..0000000
--- a/tools/binman/test/278_mkimage_missing_multiple.dts
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               mkimage {
-                       args = "-n test -T script";
-                       multiple-data-files;
-
-                       blob-ext {
-                               filename = "missing.bin";
-                       };
-               };
-       };
-};

diff --git a/tools/binman/test/291_rockchip_tpl.dts b/tools/binman/test/291_rockchip_tpl.dts
new file mode 100644 (file)
index 0000000..269f56e
--- /dev/null
+++ b/tools/binman/test/291_rockchip_tpl.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               rockchip-tpl {
+                       filename = "rockchip-tpl.bin";
+               };
+       };
+};

diff --git a/tools/binman/test/292_mkimage_missing_multiple.dts b/tools/binman/test/292_mkimage_missing_multiple.dts
new file mode 100644 (file)
index 0000000..f84aea4
--- /dev/null
+++ b/tools/binman/test/292_mkimage_missing_multiple.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               mkimage {
+                       args = "-n test -T script";
+                       multiple-data-files;
+
+                       blob-ext {
+                               filename = "missing.bin";
+                       };
+               };
+       };
+};