build: Genereate OPTEE_SP_UUID from cmake
Generate the OPTEE_SP_UUID define from cmake instead of having it
defined optee_sp_user_defines.h.
The ${NAME}_SP_UUID_BYTES defined inside ${NAME}_sp.h are not used
anywhere. Delete them, and generate a OPTEE_SP_UUID_BYTES definition
instead.
This will mean that there is only one definition for the UUID and the
other formats are derived from it.
Signed-off-by: Jelle Sels <jelle.sels@arm.com>
Change-Id: Ia7b4cba22c47350cbbef7de370892ffe8f08a908
diff --git a/deployments/env-test/common/env_test.h b/deployments/env-test/common/env_test.h
index 7a25ee2..4fd9792 100644
--- a/deployments/env-test/common/env_test.h
+++ b/deployments/env-test/common/env_test.h
@@ -7,8 +7,4 @@
#ifndef ENV_TEST_H
#define ENV_TEST_H
-#define ENV_TEST_SP_UUID_BYTES \
- {0x33, 0xc7, 0x5b, 0xaf, 0xac, 0x6a, 0x4f, 0xef, \
- 0x8a, 0xc7, 0xe9, 0x90, 0x9b, 0xee, 0x2d, 0x17}
-
#endif /* ENV_TEST_H */
diff --git a/deployments/env-test/opteesp/CMakeLists.txt b/deployments/env-test/opteesp/CMakeLists.txt
index cff00ff..7031a01 100644
--- a/deployments/env-test/opteesp/CMakeLists.txt
+++ b/deployments/env-test/opteesp/CMakeLists.txt
@@ -22,9 +22,13 @@
add_executable(env-test)
target_include_directories(env-test PRIVATE "${TOP_LEVEL_INCLUDE_DIRS}")
set(SP_UUID_CANON "33c75baf-ac6a-4fe4-8ac7-e9909bee2d17")
-set(SP_UUID_LE "0xaf5bc733 0xe44f6aac 0x90e9c78a 0x172dee9b")
set(SP_HEAP_SIZE "32 * 1024" CACHE STRING "SP heap size in bytes")
set(TRACE_PREFIX "ENVTEST" CACHE STRING "Trace prefix")
+include(${TS_ROOT}/tools/cmake/common/TargetCompileDefinitions.cmake)
+set_target_uuids(
+ SP_UUID ${SP_UUID_CANON}
+ SP_NAME "env-test"
+)
#-------------------------------------------------------------------------------
# Components that are env-test specific to deployment in the opteesp
diff --git a/deployments/env-test/opteesp/optee_sp_user_defines.h b/deployments/env-test/opteesp/optee_sp_user_defines.h
index 7c78790..ebc7dad 100644
--- a/deployments/env-test/opteesp/optee_sp_user_defines.h
+++ b/deployments/env-test/opteesp/optee_sp_user_defines.h
@@ -6,10 +6,6 @@
#ifndef OPTEE_SP_USER_DEFINES_H
#define OPTEE_SP_USER_DEFINES_H
-#define OPTEE_SP_UUID \
- {0x33c75baf, 0xac6a, 0x4fe4, \
- {0x8a, 0xc7, 0xe9, 0x90, 0x9b, 0xee, 0x2d, 0x17}}
-
#define OPTEE_SP_FLAGS 0
/* Provisioned stack size */