Change UUID to little-endian in SP manifest
Currently in the SP manifest the UUID is represented as big-endian.
Change this to little-endian to get better aligned with OP-TEE and TF-A
which expect this format.
Signed-off-by: Balint Dobszay <balint.dobszay@arm.com>
Change-Id: I1ed9e64aab624121fa2c6586c64036f60d727fc8
diff --git a/deployments/sfs-demo/sp/CMakeLists.txt b/deployments/sfs-demo/sp/CMakeLists.txt
index 5e9f992..5c0d098 100644
--- a/deployments/sfs-demo/sp/CMakeLists.txt
+++ b/deployments/sfs-demo/sp/CMakeLists.txt
@@ -20,7 +20,8 @@
add_executable(sfs-demo)
target_include_directories(sfs-demo PRIVATE "${TOP_LEVEL_INCLUDE_DIRS}")
set(SP_NAME "sfs-demo")
-set(SP_UUID "01109cf8-e5ca-446f-9b55-f3cdc65110c8")
+set(SP_UUID_CANON "01109cf8-e5ca-446f-9b55-f3cdc65110c8")
+set(SP_UUID_LE "0xf89c1001 0x6f44cae5 0xcdf3559b 0xc81051c6")
set(TRACE_PREFIX "SFSDEMO" CACHE STRING "Trace prefix")
set(SP_STACK_SIZE "64 * 1024" CACHE STRING "Stack size")
set(SP_HEAP_SIZE "32 * 1024" CACHE STRING "Heap size")
@@ -56,11 +57,11 @@
)
endif()
-compiler_generate_binary_output(TARGET sfs-demo NAME "${SP_UUID}.bin" SP_BINARY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SP_UUID}.bin DESTINATION ${TS_ENV}/bin)
+compiler_generate_binary_output(TARGET sfs-demo NAME "${SP_UUID_CANON}.bin" SP_BINARY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SP_UUID_CANON}.bin DESTINATION ${TS_ENV}/bin)
include(${TS_ROOT}/tools/cmake/common/ExportMemoryRegionsToManifest.cmake REQUIRED)
-export_memory_regions_to_manifest(TARGET sfs-demo NAME "${SP_UUID}_memory_regions.dtsi" RES EXPORT_MEMORY_REGIONS_DTSI)
+export_memory_regions_to_manifest(TARGET sfs-demo NAME "${SP_UUID_CANON}_memory_regions.dtsi" RES EXPORT_MEMORY_REGIONS_DTSI)
######################################## install
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -73,9 +74,10 @@
include(${TS_ROOT}/tools/cmake/common/ExportSp.cmake REQUIRED)
export_sp(
- SP_UUID ${SP_UUID}
+ SP_UUID_CANON ${SP_UUID_CANON}
+ SP_UUID_LE ${SP_UUID_LE}
SP_NAME ${SP_NAME}
DTS_IN ${CMAKE_CURRENT_LIST_DIR}/default_${SP_NAME}.dts.in
- DTS_MEM_REGIONS ${SP_UUID}_memory_regions.dtsi
+ DTS_MEM_REGIONS ${SP_UUID_CANON}_memory_regions.dtsi
JSON_IN ${TS_ROOT}/environments/sp/sp_pkg.json.in
)