ArmPlatformPkg/ArmJunoPkg: Move the watchdog generic driver to ArmPkg/Drivers

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index ad02281926b3e4103ea28e18dd1a296338d65b00..5d9eb177e046531b9296f2cea6bab8c3b8ae9c69 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -31,14 +31,11 @@
 \r
 [BuildOptions]\r
   XCODE:*_*_ARM_PLATFORM_FLAGS  == -arch armv7\r
-  XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG\r
-\r
   GCC:*_*_ARM_PLATFORM_FLAGS    == -march=armv7-a -mfpu=neon\r
-  GCC:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG\r
-\r
   # We use A15 to get the Secure and Virtualization extensions\r
   RVCT:*_*_ARM_PLATFORM_FLAGS  == --cpu Cortex-A15\r
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
+\r
+  RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
 \r
 [LibraryClasses.common]\r
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
@@ -118,12 +115,14 @@
   ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf\r
   ArmPkg/Library/SemihostLib/SemihostLib.inf\r
   ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf\r
+  ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf\r
 \r
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
   ArmPkg/Drivers/CpuPei/CpuPei.inf\r
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   ArmPkg/Drivers/ArmGic/ArmGicLib.inf\r
   ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf\r
+  ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf\r
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
 \r
   ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf\r