7 files changed, 23 insertions, 0 deletions
diff --git a/product/juno/scp_ramfw/config_scmi.c b/product/juno/scp_ramfw/config_scmi.c
index 8a22c6b0..4dda33e2 100644
--- a/product/juno/scp_ramfw/config_scmi.c
+++ b/product/juno/scp_ramfw/config_scmi.c
@@ -122,6 +122,9 @@ struct fwk_module_config config_scmi = {
     .data =
         &(struct mod_scmi_config){
             .protocol_count_max = 6,
+#ifndef BUILD_HAS_RESOURCE_PERMISSIONS
+#    error "Please configure the disabled protocols for PSCI agents"
+#endif
             .agent_count = FWK_ARRAY_SIZE(agent_table) - 1,
             .agent_table = agent_table,
             .vendor_identifier = "arm",
diff --git a/product/rcar/scp_ramfw/config_scmi.c b/product/rcar/scp_ramfw/config_scmi.c
index a2de8fe3..7ab679b0 100644
--- a/product/rcar/scp_ramfw/config_scmi.c
+++ b/product/rcar/scp_ramfw/config_scmi.c
@@ -90,6 +90,11 @@ struct fwk_module_config config_scmi = {
     .elements = FWK_MODULE_DYNAMIC_ELEMENTS(get_element_table),
     .data = &((struct mod_scmi_config){
         .protocol_count_max = 9,
+#ifndef BUILD_HAS_RESOURCE_PERMISSIONS
+        /* No protocols are disabled for PSCI agents */
+        .dis_protocol_count_psci = 0,
+        .dis_protocol_list_psci = NULL,
+#endif
         .agent_count = FWK_ARRAY_SIZE(agent_table) - 1,
         .agent_table = agent_table,
         .vendor_identifier = "arm",
diff --git a/product/rdn1e1/scp_ramfw/config_scmi.c b/product/rdn1e1/scp_ramfw/config_scmi.c
index c1e2e2f2..4b041a0f 100644
--- a/product/rdn1e1/scp_ramfw/config_scmi.c
+++ b/product/rdn1e1/scp_ramfw/config_scmi.c
@@ -72,6 +72,9 @@ const struct fwk_module_config config_scmi = {
     .data =
         &(struct mod_scmi_config){
             .protocol_count_max = 9,
+#ifndef BUILD_HAS_RESOURCE_PERMISSIONS
+#    error "Please configure the disabled protocols for PSCI agents"
+#endif
             .agent_count = FWK_ARRAY_SIZE(agent_table) - 1,
             .agent_table = agent_table,
             .vendor_identifier = "arm",
diff --git a/product/sgi575/scp_ramfw/config_scmi.c b/product/sgi575/scp_ramfw/config_scmi.c
index 005c7f50..43b345a6 100644
--- a/product/sgi575/scp_ramfw/config_scmi.c
+++ b/product/sgi575/scp_ramfw/config_scmi.c
@@ -71,6 +71,9 @@ static struct mod_scmi_agent agent_table[] = {
 const struct fwk_module_config config_scmi = {
     .data = &((struct mod_scmi_config){
         .protocol_count_max = 9,
+#ifndef BUILD_HAS_RESOURCE_PERMISSIONS
+#    error "Please configure the disabled protocols for PSCI agents"
+#endif
         .agent_count = FWK_ARRAY_SIZE(agent_table) - 1,
         .agent_table = agent_table,
         .vendor_identifier = "arm",
diff --git a/product/sgm775/scp_ramfw/config_scmi.c b/product/sgm775/scp_ramfw/config_scmi.c
index 1b7db3ea..f0255b4a 100644
--- a/product/sgm775/scp_ramfw/config_scmi.c
+++ b/product/sgm775/scp_ramfw/config_scmi.c
@@ -81,6 +81,9 @@ static const struct mod_scmi_agent agent_table[] = {
 struct fwk_module_config config_scmi = {
     .data = &((struct mod_scmi_config){
         .protocol_count_max = 9,
+#ifndef BUILD_HAS_RESOURCE_PERMISSIONS
+#    error "Please configure the disabled protocols for PSCI agents"
+#endif
         .agent_count = FWK_ARRAY_SIZE(agent_table) - 1,
         .agent_table = agent_table,
         .vendor_identifier = "arm",
diff --git a/product/sgm776/scp_ramfw/config_scmi.c b/product/sgm776/scp_ramfw/config_scmi.c
index 7ca1ba84..fb7f77e9 100644
--- a/product/sgm776/scp_ramfw/config_scmi.c
+++ b/product/sgm776/scp_ramfw/config_scmi.c
@@ -82,6 +82,9 @@ struct fwk_module_config config_scmi = {
     .data =
         &(struct mod_scmi_config){
             .protocol_count_max = 9,
+#ifndef BUILD_HAS_RESOURCE_PERMISSIONS
+#    error "Please configure the disabled protocols for PSCI agents"
+#endif
             .agent_count = FWK_ARRAY_SIZE(agent_table) - 1,
             .agent_table = agent_table,
             .vendor_identifier = "arm",
diff --git a/product/tc0/scp_ramfw/config_scmi.c b/product/tc0/scp_ramfw/config_scmi.c
index 75f405fd..90b7764f 100644
--- a/product/tc0/scp_ramfw/config_scmi.c
+++ b/product/tc0/scp_ramfw/config_scmi.c
@@ -87,6 +87,9 @@ const struct fwk_module_config config_scmi = {
     .elements = FWK_MODULE_DYNAMIC_ELEMENTS(get_service_table),
     .data = &((struct mod_scmi_config){
         .protocol_count_max = 9,
+#ifndef BUILD_HAS_RESOURCE_PERMISSIONS
+#    error "Please configure the disabled protocols for PSCI agents"
+#endif
         .agent_count = FWK_ARRAY_SIZE(agent_table),
         .agent_table = agent_table,
         .vendor_identifier = "arm",