ARM Packages: Remove GCC filter for AARCH64 assembly files

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / ArmVExpress-FVP-AArch64.dsc

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
index 42d793e0fa749dbeadbf224f64be3629a61647d1..4bab6d62f0dde25781f768cac66feba221b132b3 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -27,6 +27,11 @@
   SKUID_IDENTIFIER               = DEFAULT\r
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf\r
 \r
+!ifndef ARM_FVP_RUN_NORFLASH\r
+  DEFINE EDK2_SKIP_PEICORE=1\r
+!endif\r
+\r
+\r
 !include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc\r
 \r
 [LibraryClasses.common]\r
@@ -42,6 +47,10 @@
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
 \r
+  # Virtio Support\r
+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
+\r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf\r
   ArmPlatformSecLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf\r
@@ -71,8 +80,14 @@
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform"\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ARM-FVP"\r
 \r
+!ifndef ARM_FOUNDATION_FVP\r
   # Up to 8 cores on Base models. This works fine if model happens to have less.\r
   gArmPlatformTokenSpaceGuid.PcdCoreCount|8\r
+  gArmPlatformTokenSpaceGuid.PcdClusterCount|2\r
+!else\r
+  # Up to 4 cores on Foundation models. This works fine if model happens to have less.\r
+  gArmPlatformTokenSpaceGuid.PcdCoreCount|4\r
+!endif\r
 \r
   #\r
   # NV Storage PCDs. Use base of 0x0C000000 for NOR1\r
@@ -97,7 +112,7 @@
   # Non-Trusted SRAM\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x2E000000\r
   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize|0x800\r
+  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize|0x1000\r
 \r
   # System Memory (2GB)\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000\r
@@ -189,6 +204,16 @@
   #\r
   # PEI Phase modules\r
   #\r
+!ifdef EDK2_SKIP_PEICORE\r
+  # UEFI is placed in RAM by bootloader\r
+  ArmPlatformPkg/PrePi/PeiMPCore.inf {\r
+    <LibraryClasses>\r
+      ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf\r
+      ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf\r
+      ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
+  }\r
+!else\r
+  # UEFI lives in FLASH and copies itself to RAM\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {\r
     <LibraryClasses>\r
       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf\r
@@ -208,6 +233,7 @@
     <LibraryClasses>\r
       NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   }\r
+!endif\r
 \r
   #\r
   # DXE\r
@@ -261,6 +287,12 @@
   ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
 !endif\r
 \r
+  #\r
+  # Platform Driver\r
+  #\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r
   #\r