feat: add v1.1 platform
Add a copy of the `aem_v8a_fvp_vhe` platform with FF-A version v1.1
Change-Id: I6e1ec6a0db6d74952d7440811f8b5107a7669a27
Signed-off-by: Karl Meakin <karl.meakin@arm.com>
diff --git a/docs/getting_started/building.rst b/docs/getting_started/building.rst
index 500e5b8..8b7c704 100644
--- a/docs/getting_started/building.rst
+++ b/docs/getting_started/building.rst
@@ -45,7 +45,7 @@
.. code:: shell
- Supported platforms: ['secure_rd_fremont', 'secure_rd_fremont_cfg1', 'secure_aem_v8a_fvp_vhe', 'aem_v8a_fvp_vhe', 'qemu_aarch64_vhe', 'secure_qemu_aarch64', 'rpi4', 'secure_tc']
+ Supported platforms: ['secure_rd_fremont', 'secure_rd_fremont_cfg1', 'secure_aem_v8a_fvp_vhe', 'aem_v8a_fvp_vhe', 'aem_v8a_fvp_vhe_ffa_v1_1', 'qemu_aarch64_vhe', 'secure_qemu_aarch64', 'rpi4', 'secure_tc']
Additional options
~~~~~~~~~~~~~~~~~~
diff --git a/kokoro/test_el3_spmc.sh b/kokoro/test_el3_spmc.sh
index c626364..a477c2e 100755
--- a/kokoro/test_el3_spmc.sh
+++ b/kokoro/test_el3_spmc.sh
@@ -12,7 +12,7 @@
HFTEST=(${TIMEOUT[@]} 1000s ./test/hftest/hftest.py)
-HYPERVISOR_PATH="$OUT/aem_v8a_fvp_vhe_clang"
+HYPERVISOR_PATH="$OUT/aem_v8a_fvp_vhe_ffa_v1_1_clang"
HFTEST+=(--log "$LOG_DIR_BASE/el3_spmc")
HFTEST+=(--el3_spmc --driver=fvp)
@@ -22,7 +22,7 @@
--partitions_json test/vmapi/ffa_both_worlds_el3_spmc/ffa_both_world_partitions_test.json
#Test Hafnium primary_only_test with EL3 SPMC and TSP SP
-${HFTEST[@]} --out_initrd "$OUT/aem_v8a_fvp_vhe_vm_clang" --hypervisor "$HYPERVISOR_PATH/hafnium.bin" \
+${HFTEST[@]} --out_initrd "$OUT/aem_v8a_fvp_vhe_ffa_v1_1_vm_clang" --hypervisor "$HYPERVISOR_PATH/hafnium.bin" \
--initrd test/vmapi/primary_only/primary_only_test
#Test EL3 SPMC with S-EL1 SP based on Hafnium standalone secure SP
diff --git a/project/reference b/project/reference
index 11129b9..80d55a5 160000
--- a/project/reference
+++ b/project/reference
@@ -1 +1 @@
-Subproject commit 11129b9636e306a7ee6beef1ce5f2b917a1f24a2
+Subproject commit 80d55a53af8b9b4bc6b8cff1c4739890e6395b6e
diff --git a/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts b/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts
index e428a6f..2cd43bf 100644
--- a/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts
+++ b/test/vmapi/ffa_both_worlds_el3_spmc/partition_manifest_nwd_primary.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <8>;
exception-level = <0>; /* EL1 */
diff --git a/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts b/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts
index 78d8fa1..49b90c7 100644
--- a/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts
+++ b/test/vmapi/ffa_secure_partition_el3_spmc/partition-manifest.dts
@@ -13,7 +13,7 @@
debug_name = "partition-manifest";
/* Properties */
- ffa-version = <0x00010002>; /* 31:16 - Major, 15:0 - Minor */
+ ffa-version = <0x00010001>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */