Remove OP-TEE dependency of SP heap

Remove OPTEE_ prefix from OPTEE_SP_HEAP_SIZE definition and move it to
the CMake file of the deployment. This is a preparation for having
generic format SPs.

Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I73028dcbdf27a44285a1cd250cd242865bf6d119
diff --git a/deployments/crypto/opteesp/CMakeLists.txt b/deployments/crypto/opteesp/CMakeLists.txt
index 442c38e..8276e67 100644
--- a/deployments/crypto/opteesp/CMakeLists.txt
+++ b/deployments/crypto/opteesp/CMakeLists.txt
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -21,6 +21,7 @@
 add_executable(crypto-sp)
 target_include_directories(crypto-sp PRIVATE "${TOP_LEVEL_INCLUDE_DIRS}")
 set(SP_UUID "d9df52d5-16a2-4bb2-9aa4-d26d3b84e8c0")
+set(SP_HEAP_SIZE "490 * 1024" CACHE STRING "SP heap size in bytes")
 set(TRACE_PREFIX "CRYPTO" CACHE STRING "Trace prefix")
 
 #-------------------------------------------------------------------------------
diff --git a/deployments/crypto/opteesp/optee_sp_user_defines.h b/deployments/crypto/opteesp/optee_sp_user_defines.h
index 2d7ba50..dc40c5e 100644
--- a/deployments/crypto/opteesp/optee_sp_user_defines.h
+++ b/deployments/crypto/opteesp/optee_sp_user_defines.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
- * Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
  */
 
 #ifndef SP_HEADER_DEFINES_H
@@ -16,7 +15,4 @@
 /* Provisioned stack size */
 #define OPTEE_SP_STACK_SIZE			(64 * 1024)
 
-/* Provisioned heap size */
-#define OPTEE_SP_HEAP_SIZE			(490 * 1024)
-
 #endif /* SP_HEADER_DEFINES_H */