commit 03e358ef8cb7c4776880c874d2a29ecd8facc506
author Jaykumar Pitambarbhai Patel <jaykumar.pitambarbhaipatel@arm.com> Thu Jan 09 19:27:20 2020 +0530
committer Jaykumar Pitambarbhai Patel <jaykumar.pitambarbhaipatel@arm.com> Fri Jan 10 15:34:43 2020 +0530
tree cf58c06874ed36a7e805a5fa40c690153d01999f
parent ea3068835754a26787a699633bc0d0761730f92b

Platform: Make manifest files common for all targets

And remove unnecessary sub-dir such as common/ and ipc/
This would make easy integration of FF tests with TFM.

Change-Id: I6eb903ae16136b9ce54430e03102524bc0afc83f
Signed-off-by: Jaykumar Pitambarbhai Patel <jaykumar.pitambarbhaipatel@arm.com>

api-tests/val/val_spe.cmake

diff --git a/api-tests/val/val_spe.cmake b/api-tests/val/val_spe.cmake
index c921d8a..be1e550 100644
--- a/api-tests/val/val_spe.cmake
+++ b/api-tests/val/val_spe.cmake
@@ -1,5 +1,5 @@
 #/** @file
-# * Copyright (c) 2019, Arm Limited or its affiliates. All rights reserved.
+# * Copyright (c) 2019-2020, Arm Limited or its affiliates. All rights reserved.
 # * SPDX-License-Identifier : Apache-2.0
 # *
 # * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,16 +22,16 @@
 
 # Listing common sources from partition
 list(APPEND PARTITION_COMMON_SRC_C_SPE
-	${PSA_ROOT_DIR}/ff/partition/common/driver_partition.c
+	${PSA_ROOT_DIR}/ff/partition/driver_partition.c
 )
 
 # Listing sources from partition for client
 list(APPEND PARTITION_IPC_CLIENT_SRC_C_SPE
-	${PSA_ROOT_DIR}/ff/partition/ipc/client_partition.c
+	${PSA_ROOT_DIR}/ff/partition/client_partition.c
 )
 # Listing sources from partition for server
 list(APPEND PARTITION_IPC_SERVER_SRC_C_SPE
-	${PSA_ROOT_DIR}/ff/partition/ipc/server_partition.c
+	${PSA_ROOT_DIR}/ff/partition/server_partition.c
 )
 
 foreach(src_file ${SUITE_CC_SOURCE_SPE})
@@ -57,7 +57,7 @@
 	${CMAKE_CURRENT_BINARY_DIR}
 	${PSA_ROOT_DIR}/val/common
 	${PSA_ROOT_DIR}/val/spe
-	${PSA_ROOT_DIR}/ff/partition/common
+	${PSA_ROOT_DIR}/ff/partition
 	${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
 	${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
 )
@@ -74,7 +74,7 @@
 	${PSA_ROOT_DIR}/val/spe
 	${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
 	${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
-	${PSA_ROOT_DIR}/ff/partition/ipc
+	${PSA_ROOT_DIR}/ff/partition
 )
 target_include_directories(${PSA_TARGET_SERVER_PARTITION_LIB} PRIVATE
 	${CMAKE_CURRENT_BINARY_DIR}
@@ -82,7 +82,7 @@
 	${PSA_ROOT_DIR}/val/spe
 	${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/common
 	${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe/crypto
-	${PSA_ROOT_DIR}/ff/partition/ipc
+	${PSA_ROOT_DIR}/ff/partition
 )
 
 # PSA Include directories