Separate the generic part of SP deployments
Move the non opteesp environment dependent code of SP deployments into
a separate directory and split CMake files into a generic and an
environment specific part.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I4f09d6d3adef07644e98f2a05d6cb077a92b385b
diff --git a/deployments/sfs-demo/opteesp/sp.c b/deployments/sfs-demo/common/sfs_demo_sp.c
similarity index 97%
rename from deployments/sfs-demo/opteesp/sp.c
rename to deployments/sfs-demo/common/sfs_demo_sp.c
index 1f049ae..a26c181 100644
--- a/deployments/sfs-demo/opteesp/sp.c
+++ b/deployments/sfs-demo/common/sfs_demo_sp.c
@@ -1,10 +1,9 @@
/*
- * 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
*/
-#include "sp.h"
#include <ffa_api.h>
#include <components/rpc/ffarpc/caller/sp/ffarpc_caller.h>
#include <components/service/secure_storage/frontend/psa/its/its_frontend.h>
diff --git a/deployments/sfs-demo/common/sfs_demo_sp.h b/deployments/sfs-demo/common/sfs_demo_sp.h
new file mode 100644
index 0000000..c9b4915
--- /dev/null
+++ b/deployments/sfs-demo/common/sfs_demo_sp.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef SFS_DEMO_SP_H
+#define SFS_DEMO_SP_H
+
+#define SFS_DEMO_SP_UUID_BYTES \
+ { 0x01, 0x10, 0x9c, 0xf8, 0xe5, 0xca, 0x44, 0x6f, \
+ 0x9b, 0x55, 0xf3, 0xcd, 0xc6, 0x51, 0x10, 0xc8, }
+
+#endif /* SFS_DEMO_SP_H */
diff --git a/deployments/sfs-demo/opteesp/CMakeLists.txt b/deployments/sfs-demo/opteesp/CMakeLists.txt
index 79539f6..6fe02ae 100644
--- a/deployments/sfs-demo/opteesp/CMakeLists.txt
+++ b/deployments/sfs-demo/opteesp/CMakeLists.txt
@@ -23,33 +23,16 @@
add_components(TARGET "sfs-demo"
BASE_DIR ${TS_ROOT}
COMPONENTS
- components/common/trace
- components/common/utils
- components/messaging/ffa/libsp
- components/rpc/common/interface
- components/rpc/common/caller
- components/rpc/ffarpc/caller/sp
- components/service/common/include
- components/service/common/client
- components/service/secure_storage/include
- components/service/secure_storage/frontend/psa/its
- components/service/secure_storage/backend/secure_storage_client
- protocols/rpc/common/packed-c
- protocols/service/secure_storage/packed-c
environments/opteesp
)
-target_sources(sfs-demo PRIVATE
- sp.c
-)
+include(../sfs-demo.cmake REQUIRED)
target_compile_definitions(sfs-demo PRIVATE
ARM64=1
)
target_include_directories(sfs-demo PRIVATE
- ${TS_ROOT}
- ${TS_ROOT}/components
${TS_ROOT}/deployments/sfs-demo/opteesp
)
diff --git a/deployments/sfs-demo/opteesp/optee_sp_user_defines.h b/deployments/sfs-demo/opteesp/optee_sp_user_defines.h
index d86d29b..b6a8929 100644
--- a/deployments/sfs-demo/opteesp/optee_sp_user_defines.h
+++ b/deployments/sfs-demo/opteesp/optee_sp_user_defines.h
@@ -2,12 +2,12 @@
/*
* Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
*/
+#ifndef OPTEE_SP_USER_DEFINES_H
+#define OPTEE_SP_USER_DEFINES_H
-#ifndef SP_HEADER_DEFINES_H
-#define SP_HEADER_DEFINES_H
-
-/* To get UUID definition */
-#include "sp.h"
+#define OPTEE_SP_UUID \
+ { 0x01109cf8, 0xe5ca, 0x446f, \
+ { 0x9b, 0x55, 0xf3, 0xcd, 0xc6, 0x51, 0x10, 0xc8 } }
#define OPTEE_SP_FLAGS 0
diff --git a/deployments/sfs-demo/opteesp/sp.h b/deployments/sfs-demo/opteesp/sp.h
deleted file mode 100644
index 2b66c1c..0000000
--- a/deployments/sfs-demo/opteesp/sp.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SP_H
-#define SP_H
-
-#define OPTEE_SP_UUID \
- { 0x01109cf8, 0xe5ca, 0x446f, \
- { 0x9b, 0x55, 0xf3, 0xcd, 0xc6, 0x51, 0x10, 0xc8 } }
-
-#define SP_UUID_BYTES \
- { 0x01, 0x10, 0x9c, 0xf8, 0xe5, 0xca, 0x44, 0x6f, \
- 0x9b, 0x55, 0xf3, 0xcd, 0xc6, 0x51, 0x10, 0xc8, }
-
-#endif /* SP_H */
diff --git a/deployments/sfs-demo/sfs-demo.cmake b/deployments/sfs-demo/sfs-demo.cmake
new file mode 100644
index 0000000..bc1cf26
--- /dev/null
+++ b/deployments/sfs-demo/sfs-demo.cmake
@@ -0,0 +1,33 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-------------------------------------------------------------------------------
+
+add_components(TARGET "sfs-demo"
+ BASE_DIR ${TS_ROOT}
+ COMPONENTS
+ components/common/trace
+ components/common/utils
+ components/messaging/ffa/libsp
+ components/rpc/common/interface
+ components/rpc/common/caller
+ components/rpc/ffarpc/caller/sp
+ components/service/common/include
+ components/service/common/client
+ components/service/secure_storage/include
+ components/service/secure_storage/frontend/psa/its
+ components/service/secure_storage/backend/secure_storage_client
+ protocols/rpc/common/packed-c
+ protocols/service/secure_storage/packed-c
+)
+
+target_sources(sfs-demo PRIVATE
+ ${CMAKE_CURRENT_LIST_DIR}/common/sfs_demo_sp.c
+)
+
+target_include_directories(sfs-demo PRIVATE
+ ${TS_ROOT}
+ ${TS_ROOT}/components
+)