From 176f1f68fa2cb42590a9a7cd970396d9c0bf2c65 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Mon, 24 Jul 2023 09:19:58 -0600
Subject: 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>
---
 tools/binman/ftest.py                              |  6 +++---
 tools/binman/test/277_rockchip_tpl.dts             | 16 ----------------
 tools/binman/test/278_mkimage_missing_multiple.dts | 19 -------------------
 tools/binman/test/291_rockchip_tpl.dts             | 16 ++++++++++++++++
 tools/binman/test/292_mkimage_missing_multiple.dts | 19 +++++++++++++++++++
 5 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 tools/binman/test/277_rockchip_tpl.dts
 delete mode 100644 tools/binman/test/278_mkimage_missing_multiple.dts
 create mode 100644 tools/binman/test/291_rockchip_tpl.dts
 create mode 100644 tools/binman/test/292_mkimage_missing_multiple.dts

(limited to 'tools')

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 376af9fa080..40d2fd5da1b 100644
--- 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
index 269f56e2545..00000000000
--- 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
index f84aea49ead..00000000000
--- 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
index 00000000000..269f56e2545
--- /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
index 00000000000..f84aea49ead
--- /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";
+			};
+		};
+	};
+};
-- 
cgit v1.2.3