CorebootModulePkg: Reformat asm constant to avoid gcc assembler fail

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index eb9791c58280f3749b1ace073bac9a8c4bef9150..6959fde22c12f3570d9f25b548eb8935da31107a 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -2,7 +2,7 @@
 # ARM processor package.\r
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\r
-# Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2015, ARM 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
@@ -31,13 +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
+  # We use A15 to get the Secure and Virtualization extensions\r
+  RVCT:*_*_ARM_PLATFORM_FLAGS  == --cpu Cortex-A15\r
 \r
-  RVCT:*_*_ARM_PLATFORM_FLAGS  == --cpu Cortex-A8\r
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG \r
+  RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
 \r
 [LibraryClasses.common]\r
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
@@ -54,15 +52,21 @@
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
 \r
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
+  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf\r
+  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf\r
+\r
   SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf\r
   UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf\r
 \r
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
+  ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf\r
+  ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf\r
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
@@ -73,7 +77,7 @@
 \r
   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf\r
-  \r
+\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
 [LibraryClasses.ARM]\r
@@ -92,11 +96,11 @@
 [LibraryClasses.common.DXE_DRIVER]\r
   ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.inf\r
 \r
-[LibraryClasses.ARM]\r
+[LibraryClasses.ARM, LibraryClasses.AARCH64]\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r
-[LibraryClasses.AARCH64]\r
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
+  # Add support for GCC stack protector\r
+  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf\r
 \r
 [Components.common]\r
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf\r
@@ -104,7 +108,6 @@
   ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
   ArmPkg/Library/ArmLib/Null/NullArmLib.inf\r
   ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf\r
-  ArmPkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   ArmPkg/Library/BdsLib/BdsLib.inf\r
   ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
   ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf\r
@@ -116,16 +119,22 @@
   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/PL390Gic/PL390GicDxe.inf\r
-  ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
-  ArmPkg/Drivers/PL390Gic/PL390GicSecLib.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
+  ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf\r
+\r
   ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf\r
   ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf\r
+  ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf\r
 \r
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 \r