ArmPlatformPkg/ArmVExpress-FVP-AArch64.dsc: Switch to Linux kernel with EFI stub...

[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 789fb58b900f118eb0fde3b64953963efd2ec9e5..685b5047bbf643b506c5e927f3ad4ed7b5141d08 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-2015, 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
@@ -72,16 +72,24 @@
   #  It could be set FALSE to save size.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
 \r
-  ## FVP platforms support hardware power control\r
-  # Disabled for now as we have a version mismatch.\r
-  gArmTokenSpaceGuid.PcdArmPsciSupport|FALSE\r
+  # Force the UEFI GIC driver to use GICv2 legacy mode. To use\r
+  # GICv3 without GICv2 legacy in UEFI, the ARM Trusted Firmware needs\r
+  # to configure the Non-Secure interrupts in the GIC Redistributors\r
+  # which is not supported at the moment.\r
+  gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE\r
 \r
 [PcdsFixedAtBuild.common]\r
   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
@@ -108,9 +116,9 @@
   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize|0x1000\r
 \r
-  # System Memory (2GB)\r
+  # System Memory (2GB - 16MB of Trusted DRAM at the top of the 32bit address space)\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000\r
-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x80000000\r
+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x7F000000\r
 \r
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
@@ -155,18 +163,19 @@
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000\r
 !else\r
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2f000000\r
+  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x2f100000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000000\r
 !endif\r
 \r
   #\r
   # ARM OS Loader\r
   #\r
-  # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from SemiHosting"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/filesystem.cpio.gz"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9"\r
-  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9"\r
+  # Use EFI Stub\r
+  gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0\r
   gArmPlatformTokenSpaceGuid.PcdFdtDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/fdt.dtb"\r
 \r
   # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)\r
@@ -174,10 +183,10 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"\r
 \r
   #\r
-  # ARM Architectual Timer Frequency\r
+  # ARM Architectural Timer Frequency\r
   #\r
-  # Set tick frequency value to 120Mhz\r
-  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|120000000\r
+  # Set tick frequency value to 100Mhz\r
+  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|100000000\r
 \r
 ################################################################################\r
 #\r
@@ -284,7 +293,7 @@
   #\r
   # Platform Driver\r
   #\r
-  ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf\r
+  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 \r
   #\r