ArmPlatformPkg/ArmVExpress-FVP-AArch64.dsc: Fixed build

The FeaturePcd gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy was not
defined in the correct section.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16881 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
index ea0c0ad07d9280ab3c0d702ff40acfd415abb132..39bff881387ce371cb1dffdd4fecac4714d418aa 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -72,6 +72,12 @@
   #  It could be set FALSE to save size.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
 \r
   #  It could be set FALSE to save size.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
 \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
 [PcdsFixedAtBuild.common]\r
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform"\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ARM-FVP"\r


@@ -159,12 +165,6 @@
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2f000000\r
   gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x2f100000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000000\r
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2f000000\r
   gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x2f100000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000000\r

-\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

 !endif\r
 \r
   #\r
 !endif\r
 \r
   #\r