commit ace460a211f5ea466fab8d7f4dc7f7fecf843b09
author Marc Moreno Berengue <marc.morenoberengue@arm.com> Thu May 03 12:57:11 2018 +0100
committer Marc Moreno Berengue <marc.morenoberengue@arm.com> Thu Jul 05 11:05:44 2018 +0100
tree a467fde57c025eadc4fc92d4135f04b619d51554
parent 214507bd42115bb1d258bc91be8937cb469d99bf

SST: Rename prepare and wipe interface names

This patch renames filenames and interface names to have a more
consistent names. It also updates the dependant tests.

The changes are:
 - sst_core_interface files to sst_object_system
 - sst_object_prepare interface to sst_system_prepare
 - sst_object_wipe_all interface to sst_system_wipe_all
 - asset to object
 - add missing platform/ext/driver directory in cmake

Change-Id: I975d60e6ececec05373bcf94d7bc2ddfe03ac7f6
Signed-off-by: Marc Moreno <marc.morenoberengue@arm.com>

test/framework/secure_suites.c

diff --git a/test/framework/secure_suites.c b/test/framework/secure_suites.c
index 144cfef..f002cd7 100644
--- a/test/framework/secure_suites.c
+++ b/test/framework/secure_suites.c
@@ -13,7 +13,7 @@
 #include "test/suites/sst/secure/sst_tests.h"
 #include "test/suites/log/secure/log_s_tests.h"
 #include "test/suites/invert/secure/invert_s_tests.h"
-#include "secure_fw/services/secure_storage/sst_core_interface.h"
+#include "secure_fw/services/secure_storage/sst_object_system.h"
 
 static struct test_suite_t test_suites[] = {
 #ifdef SERVICES_TEST_S
@@ -42,8 +42,8 @@
 static void tear_down_integ_test(void)
 {
     /* Leave the SST area clean after execute the tests */
-    sst_object_wipe_all();
-    sst_object_prepare();
+    sst_system_wipe_all();
+    sst_system_prepare();
 }
 
 void start_integ_test(void)

test/suites/sst/secure/s_test_helpers.c

diff --git a/test/suites/sst/secure/s_test_helpers.c b/test/suites/sst/secure/s_test_helpers.c
index e001885..6eadca1 100755
--- a/test/suites/sst/secure/s_test_helpers.c
+++ b/test/suites/sst/secure/s_test_helpers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -11,15 +11,15 @@
 #include <string.h>
 
 #include "test/framework/test_framework.h"
-#include "secure_fw/services/secure_storage/sst_core_interface.h"
+#include "secure_fw/services/secure_storage/sst_object_system.h"
 
 uint32_t prepare_test_ctx(struct test_result_t *ret)
 {
     /* Wipes secure storage area */
-    sst_object_wipe_all();
+    sst_system_wipe_all();
 
     /* Prepares secure storage area before write */
-    if (sst_object_prepare() != TFM_SST_ERR_SUCCESS) {
+    if (sst_system_prepare() != TFM_SST_ERR_SUCCESS) {
         TEST_FAIL("Wiped system should be preparable");
         return 1;
     }

test/suites/sst/secure/sst_sec_interface_testsuite.c

diff --git a/test/suites/sst/secure/sst_sec_interface_testsuite.c b/test/suites/sst/secure/sst_sec_interface_testsuite.c
index 02902e1..d4e8f61 100644
--- a/test/suites/sst/secure/sst_sec_interface_testsuite.c
+++ b/test/suites/sst/secure/sst_sec_interface_testsuite.c
@@ -12,7 +12,7 @@
 
 #include "test/framework/helpers.h"
 #include "secure_fw/services/secure_storage/assets/sst_asset_defs.h"
-#include "secure_fw/services/secure_storage/sst_core_interface.h"
+#include "secure_fw/services/secure_storage/sst_object_system.h"
 #include "tfm_sst_veneers.h"
 #include "s_test_helpers.h"
 
@@ -1095,7 +1095,7 @@
     }
 
     /* Calls prepare again to simulate reinitialization */
-    err = sst_object_prepare();
+    err = sst_am_prepare();
     if (err != TFM_SST_ERR_SUCCESS) {
         TEST_FAIL("Saved system should have been preparable");
         return;