Fix: add missing boot-order setting
The env-test and spmc-test deployments do not set the boot-order
which is mandatory in the build system. This triggers build errors.
Fix this and add the missing changes.
Signed-off-by: Gabor Toth <gabor.toth2@arm.com>
Change-Id: I5984ef6d1fbd2e27524a73977b3a6e015bbe92fb
diff --git a/deployments/env-test/config/n1sdp-opteesp/CMakeLists.txt b/deployments/env-test/config/n1sdp-opteesp/CMakeLists.txt
index 1ddbcf9..340a598 100644
--- a/deployments/env-test/config/n1sdp-opteesp/CMakeLists.txt
+++ b/deployments/env-test/config/n1sdp-opteesp/CMakeLists.txt
@@ -25,6 +25,7 @@
set(SP_FFA_UUID_CANON "${TS_RPC_UUID_CANON}")
set(SP_HEAP_SIZE "32 * 1024" CACHE STRING "SP heap size in bytes")
+set(SP_BOOT_ORDER "0")
set(TRACE_PREFIX "ENVTEST" CACHE STRING "Trace prefix")
target_include_directories(env-test PRIVATE
@@ -85,6 +86,7 @@
export_sp(
SP_FFA_UUID_CANON ${SP_FFA_UUID_CANON}
SP_BIN_UUID_CANON ${SP_BIN_UUID_CANON}
+ SP_BOOT_ORDER ${SP_BOOT_ORDER}
SP_NAME "env-test"
MK_IN ${TS_ROOT}/environments/opteesp/sp.mk.in
DTS_IN ${CMAKE_CURRENT_LIST_DIR}/default_env-test.dts.in
diff --git a/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in b/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in
index 9c09689..c8c8c38 100644
--- a/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in
+++ b/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in
@@ -15,6 +15,7 @@
exception-level = <1>; /* S-EL0 */
execution-state = <0>; /* AArch64 */
xlat-granule = <0>; /* 4KiB */
+ boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
messaging-method = <3>; /* Direct messaging only */
ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
elf-format = <1>;