Add protected-storage and internal-trusted-storage deployments

Adds SP deployments for protected-storage and
internal-trusted-storage, replacing the secure-storage deployment.
Includes service-level tests based on PSA ITS and PS APIs.
Amended to fix discovery bugs of storage sp from another sp.

Signed-off-by: Julian Hall <julian.hall@arm.com>
Change-Id: Ia1a8b6b1b694f00034c69b6d03018faa4b2588e6
diff --git a/components/service/locator/standalone/standalone_env.cpp b/components/service/locator/standalone/standalone_env.cpp
index 41dd206..132b6d5 100644
--- a/components/service/locator/standalone/standalone_env.cpp
+++ b/components/service/locator/standalone/standalone_env.cpp
@@ -6,6 +6,8 @@
 
 #include <service_locator.h>
 #include <service/locator/standalone/services/crypto/crypto_service_context.h>
+#include <service/locator/standalone/services/internal-trusted-storage/its_service_context.h>
+#include <service/locator/standalone/services/protected-storage/ps_service_context.h>
 #include <service/locator/standalone/services/test-runner/test_runner_service_context.h>
 #include "standalone_location_strategy.h"
 #include "standalone_service_registry.h"
@@ -15,8 +17,14 @@
     static crypto_service_context crypto_context("sn:trustedfirmware.org:crypto:0");
     standalone_service_registry::instance()->regsiter_service_instance(&crypto_context);
 
+    static its_service_context its_service_context("sn:trustedfirmware.org:internal-trusted-storage:0");
+    standalone_service_registry::instance()->regsiter_service_instance(&its_service_context);
+
+    static ps_service_context ps_service_context("sn:trustedfirmware.org:protected-storage:0");
+    standalone_service_registry::instance()->regsiter_service_instance(&ps_service_context);
+
     static test_runner_service_context test_runner_context("sn:trustedfirmware.org:test-runner:0");
     standalone_service_registry::instance()->regsiter_service_instance(&test_runner_context);
 
     service_locator_register_strategy(standalone_location_strategy());
-}
\ No newline at end of file
+}