diff --git a/product/synquacer/include/synquacer_core.h b/product/synquacer/include/synquacer_core.h
index 51938e4e3f04c0fdd2b69daa25d62ef3d52e9624..69c74d320c282c15ab065a117dd060b676f54a1f 100644
--- a/product/synquacer/include/synquacer_core.h
+++ b/product/synquacer/include/synquacer_core.h
@@ -11,17 +11,28 @@
 #include <stdint.h>
 
 /* Maximum number of clusters */
-#define SYNQUACER_CSS_CPUS_CLUSTER_MAX UINT32_C(12)
+#define SYNQUACER_CSS_CPUS_CLUSTER UINT32_C(12)
 
 /* Maximum number of CPUs per cluster */
-#define SYNQUACER_CSS_CPUS_PER_CLUSTER_MAX UINT32_C(2)
+#define SYNQUACER_CSS_CPUS_PER_CLUSTER UINT32_C(2)
 
 /* Maximum number of CPUs */
-#define SYNQUACER_CSS_CPUS_MAX \
-    (SYNQUACER_CSS_CPUS_CLUSTER_MAX * SYNQUACER_CSS_CPUS_PER_CLUSTER_MAX)
+#define SYNQUACER_CSS_CPUS \
+    (SYNQUACER_CSS_CPUS_CLUSTER * SYNQUACER_CSS_CPUS_PER_CLUSTER)
 
-uint32_t synquacer_core_get_core_count(void);
-uint32_t synquacer_core_get_cluster_count(void);
-uint32_t synquacer_core_get_core_per_cluster_count(void);
+static inline uint32_t synquacer_core_get_cluster_count(void)
+{
+    return SYNQUACER_CSS_CPUS_CLUSTER;
+}
+
+static inline uint32_t synquacer_core_get_core_per_cluster_count(void)
+{
+    return SYNQUACER_CSS_CPUS_PER_CLUSTER;
+}
+
+static inline uint32_t synquacer_core_get_core_count(void)
+{
+    return SYNQUACER_CSS_CPUS;
+}
 
 #endif /* SYNQUACER_CORE_H */
diff --git a/product/synquacer/scp_ramfw/config_scmi_apcore.c b/product/synquacer/scp_ramfw/config_scmi_apcore.c
index 1443620f759b492e64c9470af27e49b9e5c491d4..8ccbf73480fe7ad7544ddae5e1426a042dd7a5c7 100644
--- a/product/synquacer/scp_ramfw/config_scmi_apcore.c
+++ b/product/synquacer/scp_ramfw/config_scmi_apcore.c
@@ -16,7 +16,7 @@ static const struct mod_scmi_apcore_reset_register_group
     reset_reg_group_table[] = {
         {
             .base_register = (uintptr_t)&PIK_CLUSTER(0)->RVBARADDR0_LW,
-            .register_count = SYNQUACER_CSS_CPUS_MAX,
+            .register_count = SYNQUACER_CSS_CPUS,
         },
     };
 
diff --git a/product/synquacer/scp_ramfw/firmware.mk b/product/synquacer/scp_ramfw/firmware.mk
index 28fc093a1b708bb5ac7437e670d210a6b975713f..cafbfe44a58cb3f145a1443b7bf27aaed6f4164b 100644
--- a/product/synquacer/scp_ramfw/firmware.mk
+++ b/product/synquacer/scp_ramfw/firmware.mk
@@ -67,8 +67,6 @@ BS_FIRMWARE_SOURCES := \
     config_synquacer_memc.c \
     config_system_power.c \
     config_timer.c \
-    rtx_config.c \
-    synquacer_core.c
-
+    rtx_config.c
 
 include $(BS_DIR)/firmware.mk
diff --git a/product/synquacer/src/synquacer_core.c b/product/synquacer/src/synquacer_core.c
deleted file mode 100644
index 5be497bda9e6000170398e6472a6fde044067e86..0000000000000000000000000000000000000000
--- a/product/synquacer/src/synquacer_core.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2018-2019, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <synquacer_core.h>
-
-uint32_t synquacer_core_get_core_count(void)
-{
-    return SYNQUACER_CSS_CPUS_MAX;
-}
-
-uint32_t synquacer_core_get_cluster_count(void)
-{
-    return SYNQUACER_CSS_CPUS_CLUSTER_MAX;
-}
-
-uint32_t synquacer_core_get_core_per_cluster_count(void)
-{
-    return SYNQUACER_CSS_CPUS_PER_CLUSTER_MAX;
-}