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/env-test/opteesp/env_test.c b/deployments/env-test/common/env_test.c
similarity index 100%
rename from deployments/env-test/opteesp/env_test.c
rename to deployments/env-test/common/env_test.c
diff --git a/deployments/env-test/common/env_test.h b/deployments/env-test/common/env_test.h
new file mode 100644
index 0000000..7a25ee2
--- /dev/null
+++ b/deployments/env-test/common/env_test.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#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/env_test_tests.c b/deployments/env-test/common/env_test_tests.c
similarity index 100%
rename from deployments/env-test/opteesp/env_test_tests.c
rename to deployments/env-test/common/env_test_tests.c
diff --git a/deployments/env-test/opteesp/env_test_tests.h b/deployments/env-test/common/env_test_tests.h
similarity index 100%
rename from deployments/env-test/opteesp/env_test_tests.h
rename to deployments/env-test/common/env_test_tests.h
diff --git a/deployments/env-test/env_test.cmake b/deployments/env-test/env-test.cmake
similarity index 81%
rename from deployments/env-test/env_test.cmake
rename to deployments/env-test/env-test.cmake
index bebd9f5..3a290eb 100644
--- a/deployments/env-test/env_test.cmake
+++ b/deployments/env-test/env-test.cmake
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -19,6 +19,7 @@
TARGET "env-test"
BASE_DIR ${TS_ROOT}
COMPONENTS
+ "components/common/fdt"
"components/common/tlv"
"components/config/ramstore"
"components/rpc/common/interface"
@@ -40,6 +41,19 @@
)
#-------------------------------------------------------------------------------
+# Deployment specific source files
+#-------------------------------------------------------------------------------
+target_sources(env-test PRIVATE
+ ${CMAKE_CURRENT_LIST_DIR}/common/env_test.c
+ ${CMAKE_CURRENT_LIST_DIR}/common/env_test_tests.c
+)
+
+target_include_directories(env-test PRIVATE
+ ${TS_ROOT}
+ ${TS_ROOT}/components
+)
+
+#-------------------------------------------------------------------------------
# Components used from external projects
#
#-------------------------------------------------------------------------------
diff --git a/deployments/env-test/opteesp/CMakeLists.txt b/deployments/env-test/opteesp/CMakeLists.txt
index 6e23d6e..323cd86 100644
--- a/deployments/env-test/opteesp/CMakeLists.txt
+++ b/deployments/env-test/opteesp/CMakeLists.txt
@@ -47,15 +47,7 @@
# env-test
#
#-------------------------------------------------------------------------------
-include(../env_test.cmake REQUIRED)
-
-#-------------------------------------------------------------------------------
-# Deployment specific source files
-#-------------------------------------------------------------------------------
-target_sources(env-test PRIVATE
- env_test.c
- env_test_tests.c
-)
+include(../env-test.cmake REQUIRED)
#-------------------------------------------------------------------------------
# Set target platform to provide drivers needed by the deployment
@@ -74,8 +66,6 @@
)
target_include_directories(env-test PRIVATE
- ${TS_ROOT}
- ${TS_ROOT}/components
${TS_ROOT}/deployments/env-test/opteesp
)
diff --git a/deployments/env-test/opteesp/env_test.h b/deployments/env-test/opteesp/env_test.h
deleted file mode 100644
index 0f4c8b7..0000000
--- a/deployments/env-test/opteesp/env_test.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ENV_TEST_SP_H
-#define ENV_TEST_SP_H
-
-#define ENV_TEST_SP_UUID \
- {0x33c75baf, 0xac6a, 0x4fe4, \
- {0x8a, 0xc7, 0xe9, 0x90, 0x9b, 0xee, 0x2d, 0x17}}
-
-#define ENV_TEST_SP_UUID_BYTES \
- {0x33, 0xc7, 0x5b, 0xaf, 0xac, 0x6a, 0x4f, 0xef, \
- 0x8a, 0xcy, 0xe9, 0x90, 0x9b, 0xee, 0x2d, 0x17}
-
-#endif /* ENV_TEST_SP_H */
diff --git a/deployments/env-test/opteesp/optee_sp_user_defines.h b/deployments/env-test/opteesp/optee_sp_user_defines.h
index ac429cf..7c78790 100644
--- a/deployments/env-test/opteesp/optee_sp_user_defines.h
+++ b/deployments/env-test/opteesp/optee_sp_user_defines.h
@@ -3,13 +3,13 @@
* Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
*/
-#ifndef SP_HEADER_DEFINES_H
-#define SP_HEADER_DEFINES_H
+#ifndef OPTEE_SP_USER_DEFINES_H
+#define OPTEE_SP_USER_DEFINES_H
-/* To get UUID definition */
-#include "env_test.h"
+#define OPTEE_SP_UUID \
+ {0x33c75baf, 0xac6a, 0x4fe4, \
+ {0x8a, 0xc7, 0xe9, 0x90, 0x9b, 0xee, 0x2d, 0x17}}
-#define OPTEE_SP_UUID ENV_TEST_SP_UUID
#define OPTEE_SP_FLAGS 0
/* Provisioned stack size */