2 files changed, 5 insertions, 4 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
index 64191f32ea..1dcb7e1007 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h
@@ -65,10 +65,6 @@
 // Memory-mapped peripherals
 ************************************************************************************/
 
-// Note: There is no System Configuration Controller on the Model,
-// So do dummy definition to avoid build failures
-#define ARM_VE_SCC_BASE
-
 // SP810 Controller
 #undef SP810_CTRL_BASE
 #define SP810_CTRL_BASE                         0x1C020000
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
index e26052a0ca..204f2ad9de 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c
@@ -217,8 +217,13 @@ ArmPlatformSysConfigSetDevice (
   // Intercept some functions
   switch(Function) {
   case SYS_CFG_SCC:
+#ifdef ARM_VE_SCC_BASE
     MmioWrite32 ((ARM_VE_SCC_BASE + (Device * 4)),Value);
     return EFI_SUCCESS;
+#else
+    // There is no System Configuration Controller on the Model
+    return EFI_UNSUPPORTED;
+#endif
 
   case SYS_CFG_OSC_SITE1:
     Function = SYS_CFG_OSC;