ArmVirtPkg/ArmVirtQemuKernel ARM: make some PCD settings apply to ARM

Move some PCD settings outs of the [PcdsFixedAtBuild.AARCH64] block,
so that they apply to 32-bit ARM as well. Without this change, the
ARM build doesn't work.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index d8fbf14e8f4e7cd3b20838fd3a3b52d17d0341ed..9928919bf5b0c34e10f8e3d3041dfe78a657a08f 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -130,6 +130,15 @@
   gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
 !endif\r
 \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }\r
+\r
+  #\r
+  # The maximum physical I/O addressability of the processor, set with\r
+  # BuildCpuHob().\r
+  #\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
+\r
 [PcdsPatchableInModule.common]\r
   #\r
   # This will be overridden in the code\r
@@ -146,17 +155,6 @@
   gArmTokenSpaceGuid.PcdFdBaseAddress|0x0\r
   gArmTokenSpaceGuid.PcdFvBaseAddress|0x0\r
 \r
-[PcdsFixedAtBuild.AARCH64]\r
-\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }\r
-\r
-  #\r
-  # The maximum physical I/O addressability of the processor, set with\r
-  # BuildCpuHob().\r
-  #\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
-\r
 [PcdsDynamicDefault.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r