4 files changed, 7 insertions, 7 deletions
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 5c2ba5a18a..cf68f5d689 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -71,8 +71,8 @@
   ArmTrustZoneLib|ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf
   ArmMPCoreMailBoxLib|ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf
   
-  PL354SmcSecLib|ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
-  #PL341DmcLib|ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf
+  PL354SmcLib|ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
+  PL341DmcLib|ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf
   PL301AxiLib|ArmPkg/Drivers/PL301Axi/PL301Axi.inf
   PL310L2CacheSecLib|ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf
   
@@ -128,7 +128,7 @@
   ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
   ArmPkg/Drivers/PL301Axi/PL301Axi.inf
   ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf
-  #ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf
+  ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf
   ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
   ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
   ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf
diff --git a/ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf b/ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
index 188f080ffc..18618eff71 100644
--- a/ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
+++ b/ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
@@ -17,7 +17,7 @@
   FILE_GUID                      = 10952220-aa32-11df-a438-0002a5d5c51b
   MODULE_TYPE                    = SEC
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = PL354SmcSecLib
+  LIBRARY_CLASS                  = PL354SmcLib
 
 [Sources.common]
   InitializeSMC.asm  | RVCT
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 42630ddb05..bd331259f7 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -93,6 +93,8 @@
   
   # ARM PL310 L2 Cache Driver
   L2X0CacheLib|ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf
+  # ARM PL354 SMC Driver
+  PL354SmcLib|ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
   # ARM PL341 DMC Driver
   PL341DmcLib|ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf
   # ARM PL301 Axi Driver
@@ -133,8 +135,6 @@
   # Uncomment to turn on GDB stub in SEC. 
   #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.inf
   
-  # ARM PL354 SMC Driver
-  PL354SmcSecLib|ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf
   # ARM PL390 General Interrupt Driver in Secure and Non-secure
   PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf
   PL390GicNonSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf
index aefd53c486..a9b2221304 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf
@@ -30,7 +30,7 @@
   IoLib
   ArmLib
   ArmTrustZoneLib
-  PL354SmcSecLib
+  PL354SmcLib
   PL341DmcLib
   PL301AxiLib
   L2X0CacheLib