ArmPkg: remove redundant _ARM_PLATFORM_FLAGS overrides

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 22332090db7111e0668607a16288cefc1bace926..5d83c18b143e4801319dfbdcfe2e1a10e9ec2cdc 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -27,13 +27,10 @@
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/Arm\r
   SUPPORTED_ARCHITECTURES        = ARM|AARCH64\r
-  BUILD_TARGETS                  = DEBUG|RELEASE\r
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 [BuildOptions]\r
-  XCODE:*_*_ARM_PLATFORM_FLAGS  == -arch armv7\r
-  GCC:*_*_ARM_PLATFORM_FLAGS    == -march=armv7-a -mfpu=neon\r
-\r
   RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
   *_*_*_CC_FLAGS  = -DDISABLE_NEW_DEPRECATED_INTERFACES\r
 \r
@@ -71,6 +68,7 @@
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf\r
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
+  OpteeLib|ArmPkg/Library/OpteeLib/OpteeLib.inf\r
 \r
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
@@ -131,6 +129,7 @@
   ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf\r
   ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf\r
   ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf\r
+  ArmPkg/Library/OpteeLib/OpteeLib.inf\r
 \r
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 \r
@@ -150,3 +149,4 @@
 \r
 [Components.AARCH64]\r
   ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf\r
+  ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf\r