EmulatorPkg: Support a second GOP window

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index acf679651ddf06b9942a247612dfd1713260435a..25c6ccaeb690fbad656c1b4058812e30789621ba 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -5,13 +5,7 @@
 # Copyright (c) 2011 - 2018, ARM Ltd. All rights reserved.<BR>\r
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
 #\r
-#    This program and the accompanying materials\r
-#    are licensed and made available under the terms and conditions of the BSD License\r
-#    which accompanies this distribution. The full text of the license may be found at\r
-#    http://opensource.org/licenses/bsd-license.php\r
-#\r
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 #**/\r
 \r
@@ -31,9 +25,6 @@
   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
@@ -117,7 +108,6 @@
   ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf\r
   ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf\r
   ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf\r
-  ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf\r
 \r
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
   ArmPkg/Drivers/CpuPei/CpuPei.inf\r
@@ -145,7 +135,6 @@
   ArmPkg/Library/ArmGicArchSecLib/ArmGicArchSecLib.inf\r
   ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
   ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf\r
-  ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf\r
   ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
   ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
 \r
@@ -153,3 +142,4 @@
 \r
 [Components.AARCH64]\r
   ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf\r
+  ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf\r