aboutsummaryrefslogtreecommitdiff
path: root/tools/binman/test
diff options
context:
space:
mode:
Diffstat (limited to 'tools/binman/test')
-rw-r--r--tools/binman/test/082_fdt_update_all.dts2
-rw-r--r--tools/binman/test/230_dev.key (renamed from tools/binman/test/225_dev.key)0
-rw-r--r--tools/binman/test/230_pre_load.dts (renamed from tools/binman/test/225_pre_load.dts)2
-rw-r--r--tools/binman/test/231_pre_load_pkcs.dts (renamed from tools/binman/test/226_pre_load_pkcs.dts)2
-rw-r--r--tools/binman/test/232_pre_load_pss.dts (renamed from tools/binman/test/227_pre_load_pss.dts)2
-rw-r--r--tools/binman/test/233_pre_load_invalid_padding.dts (renamed from tools/binman/test/228_pre_load_invalid_padding.dts)2
-rw-r--r--tools/binman/test/234_pre_load_invalid_sha.dts (renamed from tools/binman/test/229_pre_load_invalid_sha.dts)2
-rw-r--r--tools/binman/test/235_pre_load_invalid_algo.dts (renamed from tools/binman/test/230_pre_load_invalid_algo.dts)2
-rw-r--r--tools/binman/test/236_pre_load_invalid_key.dts (renamed from tools/binman/test/231_pre_load_invalid_key.dts)2
-rw-r--r--tools/binman/test/237_unique_names.dts (renamed from tools/binman/test/230_unique_names.dts)0
-rw-r--r--tools/binman/test/238_unique_names_multi.dts (renamed from tools/binman/test/231_unique_names_multi.dts)0
-rw-r--r--tools/binman/test/239_replace_with_bintool.dts (renamed from tools/binman/test/232_replace_with_bintool.dts)0
-rw-r--r--tools/binman/test/240_fit_extract_replace.dts (renamed from tools/binman/test/233_fit_extract_replace.dts)0
-rw-r--r--tools/binman/test/241_replace_section_simple.dts (renamed from tools/binman/test/234_replace_section_simple.dts)0
-rw-r--r--tools/binman/test/242_mkimage_name.dts (renamed from tools/binman/test/235_mkimage_name.dts)0
-rw-r--r--tools/binman/test/243_mkimage_image.dts (renamed from tools/binman/test/236_mkimage_image.dts)0
-rw-r--r--tools/binman/test/244_mkimage_image_no_content.dts (renamed from tools/binman/test/237_mkimage_image_no_content.dts)0
-rw-r--r--tools/binman/test/245_mkimage_image_bad.dts (renamed from tools/binman/test/238_mkimage_image_bad.dts)0
-rw-r--r--tools/binman/test/246_collection_other.dts (renamed from tools/binman/test/239_collection_other.dts)0
-rw-r--r--tools/binman/test/247_mkimage_coll.dts (renamed from tools/binman/test/240_mkimage_coll.dts)0
-rw-r--r--tools/binman/test/248_compress_dtb_prepend_invalid.dts (renamed from tools/binman/test/235_compress_dtb_prepend_invalid.dts)0
-rw-r--r--tools/binman/test/249_compress_dtb_prepend_length.dts (renamed from tools/binman/test/236_compress_dtb_prepend_length.dts)0
-rw-r--r--tools/binman/test/250_compress_dtb_invalid.dts (renamed from tools/binman/test/237_compress_dtb_invalid.dts)0
-rw-r--r--tools/binman/test/251_compress_dtb_zstd.dts (renamed from tools/binman/test/238_compress_dtb_zstd.dts)0
-rw-r--r--tools/binman/test/252_mkimage_mult_data.dts21
-rw-r--r--tools/binman/test/253_mkimage_mult_no_content.dts22
-rw-r--r--tools/binman/test/254_mkimage_filename.dts18
-rw-r--r--tools/binman/test/255_u_boot_vpl.dts11
-rw-r--r--tools/binman/test/256_u_boot_vpl_nodtb.dts13
-rw-r--r--tools/binman/test/257_fdt_incl_vpl.dts13
-rw-r--r--tools/binman/test/258_vpl_bss_pad.dts19
31 files changed, 126 insertions, 7 deletions
diff --git a/tools/binman/test/082_fdt_update_all.dts b/tools/binman/test/082_fdt_update_all.dts
index 284975cc289..1aea56989f0 100644
--- a/tools/binman/test/082_fdt_update_all.dts
+++ b/tools/binman/test/082_fdt_update_all.dts
@@ -14,5 +14,7 @@
};
u-boot-tpl-dtb {
};
+ u-boot-vpl-dtb {
+ };
};
};
diff --git a/tools/binman/test/225_dev.key b/tools/binman/test/230_dev.key
index b36bad2cfb3..b36bad2cfb3 100644
--- a/tools/binman/test/225_dev.key
+++ b/tools/binman/test/230_dev.key
diff --git a/tools/binman/test/225_pre_load.dts b/tools/binman/test/230_pre_load.dts
index c1ffe1a2ff4..c0c24729f82 100644
--- a/tools/binman/test/225_pre_load.dts
+++ b/tools/binman/test/230_pre_load.dts
@@ -10,7 +10,7 @@
pre-load {
content = <&image>;
algo-name = "sha256,rsa2048";
- key-name = "tools/binman/test/225_dev.key";
+ key-name = "tools/binman/test/230_dev.key";
header-size = <4096>;
version = <0x11223344>;
};
diff --git a/tools/binman/test/226_pre_load_pkcs.dts b/tools/binman/test/231_pre_load_pkcs.dts
index 3db0a37f774..530638c56b6 100644
--- a/tools/binman/test/226_pre_load_pkcs.dts
+++ b/tools/binman/test/231_pre_load_pkcs.dts
@@ -11,7 +11,7 @@
content = <&image>;
algo-name = "sha256,rsa2048";
padding-name = "pkcs-1.5";
- key-name = "tools/binman/test/225_dev.key";
+ key-name = "tools/binman/test/230_dev.key";
header-size = <4096>;
version = <0x11223344>;
};
diff --git a/tools/binman/test/227_pre_load_pss.dts b/tools/binman/test/232_pre_load_pss.dts
index b1b01d5ad58..371e0fdb408 100644
--- a/tools/binman/test/227_pre_load_pss.dts
+++ b/tools/binman/test/232_pre_load_pss.dts
@@ -11,7 +11,7 @@
content = <&image>;
algo-name = "sha256,rsa2048";
padding-name = "pss";
- key-name = "tools/binman/test/225_dev.key";
+ key-name = "tools/binman/test/230_dev.key";
header-size = <4096>;
version = <0x11223344>;
};
diff --git a/tools/binman/test/228_pre_load_invalid_padding.dts b/tools/binman/test/233_pre_load_invalid_padding.dts
index 84fe289183f..9cb4cb570bc 100644
--- a/tools/binman/test/228_pre_load_invalid_padding.dts
+++ b/tools/binman/test/233_pre_load_invalid_padding.dts
@@ -11,7 +11,7 @@
content = <&image>;
algo-name = "sha256,rsa2048";
padding-name = "padding";
- key-name = "tools/binman/test/225_dev.key";
+ key-name = "tools/binman/test/230_dev.key";
header-size = <4096>;
version = <1>;
};
diff --git a/tools/binman/test/229_pre_load_invalid_sha.dts b/tools/binman/test/234_pre_load_invalid_sha.dts
index a2b6725c892..8ded98df533 100644
--- a/tools/binman/test/229_pre_load_invalid_sha.dts
+++ b/tools/binman/test/234_pre_load_invalid_sha.dts
@@ -11,7 +11,7 @@
content = <&image>;
algo-name = "sha2560,rsa2048";
padding-name = "pkcs-1.5";
- key-name = "tools/binman/test/225_dev.key";
+ key-name = "tools/binman/test/230_dev.key";
header-size = <4096>;
version = <1>;
};
diff --git a/tools/binman/test/230_pre_load_invalid_algo.dts b/tools/binman/test/235_pre_load_invalid_algo.dts
index 34c8d34f157..145286caa3e 100644
--- a/tools/binman/test/230_pre_load_invalid_algo.dts
+++ b/tools/binman/test/235_pre_load_invalid_algo.dts
@@ -11,7 +11,7 @@
content = <&image>;
algo-name = "sha256,rsa20480";
padding-name = "pkcs-1.5";
- key-name = "tools/binman/test/225_dev.key";
+ key-name = "tools/binman/test/230_dev.key";
header-size = <4096>;
version = <1>;
};
diff --git a/tools/binman/test/231_pre_load_invalid_key.dts b/tools/binman/test/236_pre_load_invalid_key.dts
index 08d5a75ddfd..df858c3a28b 100644
--- a/tools/binman/test/231_pre_load_invalid_key.dts
+++ b/tools/binman/test/236_pre_load_invalid_key.dts
@@ -11,7 +11,7 @@
content = <&image>;
algo-name = "sha256,rsa4096";
padding-name = "pkcs-1.5";
- key-name = "tools/binman/test/225_dev.key";
+ key-name = "tools/binman/test/230_dev.key";
header-size = <4096>;
version = <1>;
};
diff --git a/tools/binman/test/230_unique_names.dts b/tools/binman/test/237_unique_names.dts
index 6780d37f71f..6780d37f71f 100644
--- a/tools/binman/test/230_unique_names.dts
+++ b/tools/binman/test/237_unique_names.dts
diff --git a/tools/binman/test/231_unique_names_multi.dts b/tools/binman/test/238_unique_names_multi.dts
index db63afb445e..db63afb445e 100644
--- a/tools/binman/test/231_unique_names_multi.dts
+++ b/tools/binman/test/238_unique_names_multi.dts
diff --git a/tools/binman/test/232_replace_with_bintool.dts b/tools/binman/test/239_replace_with_bintool.dts
index d7fabd2cd83..d7fabd2cd83 100644
--- a/tools/binman/test/232_replace_with_bintool.dts
+++ b/tools/binman/test/239_replace_with_bintool.dts
diff --git a/tools/binman/test/233_fit_extract_replace.dts b/tools/binman/test/240_fit_extract_replace.dts
index b44d05afe1a..b44d05afe1a 100644
--- a/tools/binman/test/233_fit_extract_replace.dts
+++ b/tools/binman/test/240_fit_extract_replace.dts
diff --git a/tools/binman/test/234_replace_section_simple.dts b/tools/binman/test/241_replace_section_simple.dts
index c9d5c328561..c9d5c328561 100644
--- a/tools/binman/test/234_replace_section_simple.dts
+++ b/tools/binman/test/241_replace_section_simple.dts
diff --git a/tools/binman/test/235_mkimage_name.dts b/tools/binman/test/242_mkimage_name.dts
index fbc82f1f8d6..fbc82f1f8d6 100644
--- a/tools/binman/test/235_mkimage_name.dts
+++ b/tools/binman/test/242_mkimage_name.dts
diff --git a/tools/binman/test/236_mkimage_image.dts b/tools/binman/test/243_mkimage_image.dts
index 6b8f4a4a401..6b8f4a4a401 100644
--- a/tools/binman/test/236_mkimage_image.dts
+++ b/tools/binman/test/243_mkimage_image.dts
diff --git a/tools/binman/test/237_mkimage_image_no_content.dts b/tools/binman/test/244_mkimage_image_no_content.dts
index 7306c06af45..7306c06af45 100644
--- a/tools/binman/test/237_mkimage_image_no_content.dts
+++ b/tools/binman/test/244_mkimage_image_no_content.dts
diff --git a/tools/binman/test/238_mkimage_image_bad.dts b/tools/binman/test/245_mkimage_image_bad.dts
index 54d2c99d628..54d2c99d628 100644
--- a/tools/binman/test/238_mkimage_image_bad.dts
+++ b/tools/binman/test/245_mkimage_image_bad.dts
diff --git a/tools/binman/test/239_collection_other.dts b/tools/binman/test/246_collection_other.dts
index 09de20e5bca..09de20e5bca 100644
--- a/tools/binman/test/239_collection_other.dts
+++ b/tools/binman/test/246_collection_other.dts
diff --git a/tools/binman/test/240_mkimage_coll.dts b/tools/binman/test/247_mkimage_coll.dts
index 30860118860..30860118860 100644
--- a/tools/binman/test/240_mkimage_coll.dts
+++ b/tools/binman/test/247_mkimage_coll.dts
diff --git a/tools/binman/test/235_compress_dtb_prepend_invalid.dts b/tools/binman/test/248_compress_dtb_prepend_invalid.dts
index ee32670a913..ee32670a913 100644
--- a/tools/binman/test/235_compress_dtb_prepend_invalid.dts
+++ b/tools/binman/test/248_compress_dtb_prepend_invalid.dts
diff --git a/tools/binman/test/236_compress_dtb_prepend_length.dts b/tools/binman/test/249_compress_dtb_prepend_length.dts
index 1570233637a..1570233637a 100644
--- a/tools/binman/test/236_compress_dtb_prepend_length.dts
+++ b/tools/binman/test/249_compress_dtb_prepend_length.dts
diff --git a/tools/binman/test/237_compress_dtb_invalid.dts b/tools/binman/test/250_compress_dtb_invalid.dts
index 228139060bc..228139060bc 100644
--- a/tools/binman/test/237_compress_dtb_invalid.dts
+++ b/tools/binman/test/250_compress_dtb_invalid.dts
diff --git a/tools/binman/test/238_compress_dtb_zstd.dts b/tools/binman/test/251_compress_dtb_zstd.dts
index 90cf85d1e2c..90cf85d1e2c 100644
--- a/tools/binman/test/238_compress_dtb_zstd.dts
+++ b/tools/binman/test/251_compress_dtb_zstd.dts
diff --git a/tools/binman/test/252_mkimage_mult_data.dts b/tools/binman/test/252_mkimage_mult_data.dts
new file mode 100644
index 00000000000..a092bc39bf3
--- /dev/null
+++ b/tools/binman/test/252_mkimage_mult_data.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ mkimage {
+ args = "-T script";
+ multiple-data-files;
+
+ u-boot-tpl {
+ };
+
+ u-boot-spl {
+ };
+ };
+ };
+};
diff --git a/tools/binman/test/253_mkimage_mult_no_content.dts b/tools/binman/test/253_mkimage_mult_no_content.dts
new file mode 100644
index 00000000000..dd65666c62e
--- /dev/null
+++ b/tools/binman/test/253_mkimage_mult_no_content.dts
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ mkimage {
+ args = "-T script";
+ multiple-data-files;
+
+ _testing {
+ return-unknown-contents;
+ };
+
+ u-boot-spl {
+ };
+ };
+ };
+};
diff --git a/tools/binman/test/254_mkimage_filename.dts b/tools/binman/test/254_mkimage_filename.dts
new file mode 100644
index 00000000000..4483790ae86
--- /dev/null
+++ b/tools/binman/test/254_mkimage_filename.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ mkimage {
+ filename = "mkimage-test.bin";
+ args = "-T script";
+
+ u-boot-spl {
+ };
+ };
+ };
+};
diff --git a/tools/binman/test/255_u_boot_vpl.dts b/tools/binman/test/255_u_boot_vpl.dts
new file mode 100644
index 00000000000..a3a281a91e0
--- /dev/null
+++ b/tools/binman/test/255_u_boot_vpl.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+
+/ {
+ binman {
+ u-boot-vpl {
+ };
+ u-boot-vpl-dtb {
+ };
+ };
+};
diff --git a/tools/binman/test/256_u_boot_vpl_nodtb.dts b/tools/binman/test/256_u_boot_vpl_nodtb.dts
new file mode 100644
index 00000000000..055016badd5
--- /dev/null
+++ b/tools/binman/test/256_u_boot_vpl_nodtb.dts
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ u-boot-vpl-nodtb {
+ };
+ };
+};
diff --git a/tools/binman/test/257_fdt_incl_vpl.dts b/tools/binman/test/257_fdt_incl_vpl.dts
new file mode 100644
index 00000000000..435256fe317
--- /dev/null
+++ b/tools/binman/test/257_fdt_incl_vpl.dts
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ u-boot-vpl {
+ };
+ };
+};
diff --git a/tools/binman/test/258_vpl_bss_pad.dts b/tools/binman/test/258_vpl_bss_pad.dts
new file mode 100644
index 00000000000..d308dcade17
--- /dev/null
+++ b/tools/binman/test/258_vpl_bss_pad.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ binman {
+ u-boot-vpl {
+ };
+
+ u-boot-vpl-bss-pad {
+ };
+
+ u-boot {
+ };
+ };
+};
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 09:39:24 +0000