diff --git a/scp_config/fvp-morello b/scp_config/fvp-morello
index fa070eb..678a3db 100644
--- a/scp_config/fvp-morello
+++ b/scp_config/fvp-morello
@@ -1,3 +1,5 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
 PRODUCT=morello
-LOG_LEVEL=INFO
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
+EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=INFO
\ No newline at end of file
diff --git a/scp_config/fvp-rdn1edge b/scp_config/fvp-rdn1edge
index 4eebb58..21eee56 100644
--- a/scp_config/fvp-rdn1edge
+++ b/scp_config/fvp-rdn1edge
@@ -1,2 +1,4 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
 PRODUCT=rdn1e1
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
\ No newline at end of file
diff --git a/scp_config/fvp-rdv1 b/scp_config/fvp-rdv1
index 12b442c..ba2e4f2 100644
--- a/scp_config/fvp-rdv1
+++ b/scp_config/fvp-rdv1
@@ -1,2 +1,4 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
 PRODUCT=rdv1
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
\ No newline at end of file
diff --git a/scp_config/fvp-sgi575 b/scp_config/fvp-sgi575
index 2084b97..ab0e452 100644
--- a/scp_config/fvp-sgi575
+++ b/scp_config/fvp-sgi575
@@ -1,2 +1,4 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
 PRODUCT=sgi575
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
\ No newline at end of file
diff --git a/scp_config/fvp-tc0 b/scp_config/fvp-tc0
index 602cc69..e969a51 100644
--- a/scp_config/fvp-tc0
+++ b/scp_config/fvp-tc0
@@ -1,3 +1,5 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc
 PRODUCT=tc0
-LOG_LEVEL=WARN
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-g++
+EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=WARN
\ No newline at end of file
diff --git a/scp_config/fvp-tc1 b/scp_config/fvp-tc1
index e157f90..fed01b9 100644
--- a/scp_config/fvp-tc1
+++ b/scp_config/fvp-tc1
@@ -1,3 +1,5 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc
 PRODUCT=tc1
-LOG_LEVEL=WARN
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-g++
+EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=WARN
diff --git a/scp_config/juno b/scp_config/juno
index df6d969..9bf4e9e 100644
--- a/scp_config/juno
+++ b/scp_config/juno
@@ -1,2 +1,5 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
 PRODUCT=juno
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
+EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=CRIT
\ No newline at end of file
diff --git a/scp_config/juno-scmiv2 b/scp_config/juno-scmiv2
index acd3803..118a430 100644
--- a/scp_config/juno-scmiv2
+++ b/scp_config/juno-scmiv2
@@ -1,8 +1,10 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
 PRODUCT=juno
-BS_FIRMWARE_HAS_SCMI_NOTIFICATIONS=yes
-BS_FIRMWARE_HAS_FAST_CHANNELS=yes
-BS_FIRMWARE_HAS_SCMI_RESET=yes
-BS_FIRMWARE_HAS_DEBUG_UNIT=no
-BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS=no
-LOG_LEVEL=CRIT
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
+EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_SCMI_NOTIFICATIONS=ON
+EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_FAST_CHANNELS=ON
+EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_SCMI_RESET=ON
+EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_DEBUG_UNIT=OFF
+EXTRA_CONFIG_ARGS+=-DSCP_ENABLE_RESOURCE_PERMISSIONS=OFF
+EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=CRIT
\ No newline at end of file
diff --git a/scp_config/n1sdp b/scp_config/n1sdp
index 555dffd..c260fe3 100644
--- a/scp_config/n1sdp
+++ b/scp_config/n1sdp
@@ -1,3 +1,5 @@
-CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
 PRODUCT=n1sdp
-LOG_LEVEL=INFO
+EXTRA_CONFIG_ARGS+=-DCMAKE_ASM_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_C_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+EXTRA_CONFIG_ARGS+=-DCMAKE_CXX_COMPILER=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-g++
+EXTRA_CONFIG_ARGS+=-DSCP_LOG_LEVEL=INFO
\ No newline at end of file