SPM: Optimize stateless service logic

- Rename the variables to make more sense.
- Do not chain stateless services as they are never looked up.
- Fine-tune the bit definition of service flags.

Change-Id: Ie242ceefa0a9b43581d12963a92e59c6da3fa3af
Signed-off-by: Ken Liu <Ken.Liu@arm.com>
diff --git a/secure_fw/partitions/partition_load_info.template b/secure_fw/partitions/partition_load_info.template
index 94e5bed..16d9709 100644
--- a/secure_fw/partitions/partition_load_info.template
+++ b/secure_fw/partitions/partition_load_info.template
@@ -126,12 +126,12 @@
                                     | SERVICE_FLAG_NS_ACCESSIBLE
         {% endif %}
         {% if manifest.psa_framework_version > 1.0 and service.connection_based is sameas false %}
-                                    | SERVICE_FLAG_STATELESS
+                                    | SERVICE_FLAG_STATELESS | {{"%x"|format(service.stateless_handle_index)}}
         {% endif %}
         {% if service.version_policy %}
-                                    | TFM_VERSION_POLICY_{{service.version_policy}},
+                                    | SERVICE_VERSION_POLICY_{{service.version_policy}},
         {% else %}
-                                    | TFM_VERSION_POLICY_STRICT,
+                                    | SERVICE_VERSION_POLICY_STRICT,
         {% endif %}
         {% if service.version %}
             .version                = {{service.version}},