style(hftest): renaming files and build artifacts
Renaming files and build artifacts in ffa_secure_partitions to have
a cleaner and coherent setup.
Change-Id: I593c6ff9bb92d7ccd4a6832e7dad3e65906ed9cc
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/test/vmapi/ffa_secure_partitions/BUILD.gn b/test/vmapi/ffa_secure_partitions/BUILD.gn
index 6351f82..3895704 100644
--- a/test/vmapi/ffa_secure_partitions/BUILD.gn
+++ b/test/vmapi/ffa_secure_partitions/BUILD.gn
@@ -44,47 +44,36 @@
]
}
-manifest("secure_partition_services_manifest") {
- source = "partition_manifest_services_sp.dts"
- output = "partition_manifest_services_sp.dtb"
+manifest("partition_manifest_service_sp_first") {
+ source = "partition_manifest_service_sp_first.dts"
+ output = "partition_manifest_service_sp_first.dtb"
}
-manifest("secure_partition_services_secondary_manifest") {
- source = "partition_manifest_services_secondary_sp.dts"
- output = "partition_manifest_services_secondary_sp.dtb"
+manifest("partition_manifest_service_sp_second") {
+ source = "partition_manifest_service_sp_second.dts"
+ output = "partition_manifest_service_sp_second.dtb"
}
-partition_package("secure_partition_control_test_package") {
+partition_package("service_sp_second_package") {
testonly = true
files = [ [
- "partition_manifest_control_sp.dtb",
- "secure_partitions_control.bin",
- ":partition_manifest_control_sp",
- ":secure_partitions_control",
- ] ]
- output = "secure_partition_control_test_package.img"
-}
-
-partition_package("secure_partition_services_test_package") {
- testonly = true
- files = [ [
- "partition_manifest_services_sp.dtb",
+ "partition_manifest_service_sp_second.dtb",
"secure_partitions_services.bin",
- ":secure_partition_services_manifest",
+ ":partition_manifest_service_sp_second",
":secure_partitions_services",
] ]
- output = "secure_partition_services_test_package.img"
+ output = "service_sp_second_package.img"
}
-partition_package("secure_partition_services_secondary_test_package") {
+partition_package("service_sp_first_package") {
testonly = true
files = [ [
- "partition_manifest_services_secondary_sp.dtb",
+ "partition_manifest_service_sp_first.dtb",
"secure_partitions_services.bin",
- ":secure_partition_services_secondary_manifest",
+ ":partition_manifest_service_sp_first",
":secure_partitions_services",
] ]
- output = "secure_partition_services_secondary_test_package.img"
+ output = "service_sp_first_package.img"
}
manifest("vm_primary_manifest") {
@@ -114,20 +103,20 @@
]
}
-manifest("partition_manifest_services_tertiary_sel0_sp") {
- source = "partition_manifest_services_tertiary_sel0_sp.dts"
- output = "partition_manifest_services_tertiary_sel0_sp.dtb"
+manifest("partition_manifest_service_sp_second_el0") {
+ source = "partition_manifest_service_sp_second_el0.dts"
+ output = "partition_manifest_service_sp_second_el0.dtb"
}
-partition_package("sel0_sp_test_package") {
+partition_package("service_sp_second_el0_package") {
testonly = true
files = [ [
- "partition_manifest_services_tertiary_sel0_sp.dtb",
+ "partition_manifest_service_sp_second_el0.dtb",
"sel0_partition.bin",
- ":partition_manifest_services_tertiary_sel0_sp",
+ ":partition_manifest_service_sp_second_el0",
":sel0_partition",
] ]
- output = "sel0_sp_test_package.img"
+ output = "service_sp_second_el0_package.img"
}
partitions_json("ffa_both_world_partitions_vhe_test") {
@@ -135,16 +124,16 @@
sps = [
[
- "sel0_sp_test_package.img",
- "manifest_services_tertiary_sel0_sp.dts",
- ":sel0_sp_test_package",
- ":partition_manifest_services_tertiary_sel0_sp",
+ "service_sp_second_el0_package.img",
+ "manifest_service_sp_second_el0.dts",
+ ":service_sp_second_el0_package",
+ ":partition_manifest_service_sp_second_el0",
],
[
- "secure_partition_services_secondary_test_package.img",
- "manifest_services_secondary_sp.dts",
- ":secure_partition_services_secondary_test_package",
- ":secure_partition_services_secondary_manifest",
+ "service_sp_first_package.img",
+ "manifest_service_sp_first.dts",
+ ":service_sp_first_package",
+ ":partition_manifest_service_sp_first",
],
]
@@ -163,16 +152,16 @@
sps = [
[
- "secure_partition_services_test_package.img",
- "manifest_services_sp.dts",
- ":secure_partition_services_test_package",
- ":secure_partition_services_manifest",
+ "service_sp_second_package.img",
+ "manifest_service_sp_second.dts",
+ ":service_sp_second_package",
+ ":partition_manifest_service_sp_second",
],
[
- "secure_partition_services_secondary_test_package.img",
- "manifest_services_secondary_sp.dts",
- ":secure_partition_services_secondary_test_package",
- ":secure_partition_services_secondary_manifest",
+ "service_sp_first_package.img",
+ "manifest_service_sp_first.dts",
+ ":service_sp_first_package",
+ ":partition_manifest_service_sp_first",
],
]
diff --git a/test/vmapi/ffa_secure_partitions/manifest_services_secondary_sp.dts b/test/vmapi/ffa_secure_partitions/manifest_service_sp_first.dts
similarity index 89%
rename from test/vmapi/ffa_secure_partitions/manifest_services_secondary_sp.dts
rename to test/vmapi/ffa_secure_partitions/manifest_service_sp_first.dts
index 30eb504..a846707 100644
--- a/test/vmapi/ffa_secure_partitions/manifest_services_secondary_sp.dts
+++ b/test/vmapi/ffa_secure_partitions/manifest_service_sp_first.dts
@@ -12,7 +12,7 @@
vm1 {
is_ffa_partition;
load_address = <0x6480000>;
- debug_name = "ffa_sp_services_secondary";
+ debug_name = "SP Service First";
vcpu_count = <8>;
mem_size = <0x100000>;
};
diff --git a/test/vmapi/ffa_secure_partitions/manifest_services_sp.dts b/test/vmapi/ffa_secure_partitions/manifest_service_sp_second.dts
similarity index 88%
rename from test/vmapi/ffa_secure_partitions/manifest_services_sp.dts
rename to test/vmapi/ffa_secure_partitions/manifest_service_sp_second.dts
index 6c58de9..0632d27 100644
--- a/test/vmapi/ffa_secure_partitions/manifest_services_sp.dts
+++ b/test/vmapi/ffa_secure_partitions/manifest_service_sp_second.dts
@@ -12,7 +12,7 @@
vm1 {
is_ffa_partition;
load_address = <0x6380000>;
- debug_name = "ffa_secure_partition_services";
+ debug_name = "SP Service Second";
vcpu_count = <8>;
mem_size = <0x100000>;
};
diff --git a/test/vmapi/ffa_secure_partitions/manifest_services_tertiary_sel0_sp.dts b/test/vmapi/ffa_secure_partitions/manifest_service_sp_second_el0.dts
similarity index 89%
rename from test/vmapi/ffa_secure_partitions/manifest_services_tertiary_sel0_sp.dts
rename to test/vmapi/ffa_secure_partitions/manifest_service_sp_second_el0.dts
index 06063af..159b39c 100644
--- a/test/vmapi/ffa_secure_partitions/manifest_services_tertiary_sel0_sp.dts
+++ b/test/vmapi/ffa_secure_partitions/manifest_service_sp_second_el0.dts
@@ -12,7 +12,7 @@
vm1 {
is_ffa_partition;
load_address = <0x6290000>;
- debug_name = "ffa_el0_service1";
+ debug_name = "SP Service Second EL0";
vcpu_count = <1>;
mem_size = <0x100000>;
};
diff --git a/test/vmapi/ffa_secure_partitions/partition_manifest_services_secondary_sp.dts b/test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_first.dts
similarity index 94%
rename from test/vmapi/ffa_secure_partitions/partition_manifest_services_secondary_sp.dts
rename to test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_first.dts
index f3b52b4..bc1cb01 100644
--- a/test/vmapi/ffa_secure_partitions/partition_manifest_services_secondary_sp.dts
+++ b/test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_first.dts
@@ -10,7 +10,7 @@
/ {
compatible = "arm,ffa-manifest-1.0";
- debug_name = "partition-manifest";
+ debug_name = "SP Service First";
/* Properties */
ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
diff --git a/test/vmapi/ffa_secure_partitions/partition_manifest_services_sp.dts b/test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_second.dts
similarity index 94%
rename from test/vmapi/ffa_secure_partitions/partition_manifest_services_sp.dts
rename to test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_second.dts
index 2d56311..1b2cefa 100644
--- a/test/vmapi/ffa_secure_partitions/partition_manifest_services_sp.dts
+++ b/test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_second.dts
@@ -10,7 +10,7 @@
/ {
compatible = "arm,ffa-manifest-1.0";
- debug_name = "partition-manifest";
+ debug_name = "SP Service Second EL1";
/* Properties */
ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
diff --git a/test/vmapi/ffa_secure_partitions/partition_manifest_services_tertiary_sel0_sp.dts b/test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_second_el0.dts
similarity index 94%
rename from test/vmapi/ffa_secure_partitions/partition_manifest_services_tertiary_sel0_sp.dts
rename to test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_second_el0.dts
index e3fe862..98fef8b 100644
--- a/test/vmapi/ffa_secure_partitions/partition_manifest_services_tertiary_sel0_sp.dts
+++ b/test/vmapi/ffa_secure_partitions/partition_manifest_service_sp_second_el0.dts
@@ -10,7 +10,7 @@
/ {
compatible = "arm,ffa-manifest-1.0";
- debug_name = "partition-manifest";
+ debug_name = "SP Service Second EL0";
/* Properties */
ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */