binman: test: Move UEFI capsule test files to test/capsule/

Move about a dozen test files for UEFI capsule creation (signed,
versioned, accept, revert) into a capsule/ subdirectory. Drop the
numeric prefixes and the redundant capsule_ filename prefix, and
update all references.

Signed-off-by: Simon Glass <[email protected]>
Reviewed-by: Quentin Schulz <[email protected]>

13 files changed, 209 insertions, 0 deletions

diff --git a/tools/binman/test/capsule/accept.dts b/tools/binman/test/capsule/accept.dts
new file mode 100644
index 00000000000..d48e59f859b
--- /dev/null
+++ b/tools/binman/test/capsule/accept.dts
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-empty-capsule {
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			capsule-type = "accept";
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/accept_missing_guid.dts b/tools/binman/test/capsule/accept_missing_guid.dts
new file mode 100644
index 00000000000..a0088b174c5
--- /dev/null
+++ b/tools/binman/test/capsule/accept_missing_guid.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-empty-capsule {
+			capsule-type = "accept";
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/accept_revert_missing.dts b/tools/binman/test/capsule/accept_revert_missing.dts
new file mode 100644
index 00000000000..31268b20b88
--- /dev/null
+++ b/tools/binman/test/capsule/accept_revert_missing.dts
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-empty-capsule {
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			capsule-type = "foo";
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/capsule.dts b/tools/binman/test/capsule/capsule.dts
new file mode 100644
index 00000000000..0a62ef81dd2
--- /dev/null
+++ b/tools/binman/test/capsule/capsule.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			image-index = <0x1>;
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			hardware-instance = <0x0>;
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/empty_type_missing.dts b/tools/binman/test/capsule/empty_type_missing.dts
new file mode 100644
index 00000000000..d356168e775
--- /dev/null
+++ b/tools/binman/test/capsule/empty_type_missing.dts
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-empty-capsule {
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/missing_guid.dts b/tools/binman/test/capsule/missing_guid.dts
new file mode 100644
index 00000000000..85d3317ecb5
--- /dev/null
+++ b/tools/binman/test/capsule/missing_guid.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			image-index = <0x1>;
+			hardware-instance = <0x0>;
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/missing_index.dts b/tools/binman/test/capsule/missing_index.dts
new file mode 100644
index 00000000000..99a54d55c33
--- /dev/null
+++ b/tools/binman/test/capsule/missing_index.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			hardware-instance = <0x0>;
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/missing_key.dts b/tools/binman/test/capsule/missing_key.dts
new file mode 100644
index 00000000000..a14a74ee779
--- /dev/null
+++ b/tools/binman/test/capsule/missing_key.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			image-index = <0x1>;
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			hardware-instance = <0x0>;
+			private-key = "tools/binman/test/key.key";
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/oemflags.dts b/tools/binman/test/capsule/oemflags.dts
new file mode 100644
index 00000000000..45853f69c31
--- /dev/null
+++ b/tools/binman/test/capsule/oemflags.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			image-index = <0x1>;
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			hardware-instance = <0x0>;
+			oem-flags = <0x8000>;
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/revert.dts b/tools/binman/test/capsule/revert.dts
new file mode 100644
index 00000000000..bd141ef2924
--- /dev/null
+++ b/tools/binman/test/capsule/revert.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-empty-capsule {
+			capsule-type = "revert";
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/signed.dts b/tools/binman/test/capsule/signed.dts
new file mode 100644
index 00000000000..4ab838efedd
--- /dev/null
+++ b/tools/binman/test/capsule/signed.dts
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			image-index = <0x1>;
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			hardware-instance = <0x0>;
+			private-key = "key.key";
+			public-key-cert = "key.crt";
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/signed_ver.dts b/tools/binman/test/capsule/signed_ver.dts
new file mode 100644
index 00000000000..649b8ccb2df
--- /dev/null
+++ b/tools/binman/test/capsule/signed_ver.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			image-index = <0x1>;
+			fw-version = <0x2>;
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			hardware-instance = <0x0>;
+			private-key = "key.key";
+			public-key-cert = "key.crt";
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};
diff --git a/tools/binman/test/capsule/version.dts b/tools/binman/test/capsule/version.dts
new file mode 100644
index 00000000000..19e7e833480
--- /dev/null
+++ b/tools/binman/test/capsule/version.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+	binman {
+		efi-capsule {
+			image-index = <0x1>;
+			fw-version = <0x2>;
+			/* Image GUID for testing capsule update */
+			image-guid = "binman-test";
+			hardware-instance = <0x0>;
+
+			blob {
+				filename = "capsule_input.bin";
+			};
+		};
+	};
+};