diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-12-11 10:21:25 +0100 |
---|---|---|
committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-12-11 17:48:09 +0100 |
commit | ded3c57623b5ddc0045aa3633fd7df0907b6ebd3 (patch) | |
tree | f7d4513e916935017242a96294d5f2be8d62a413 | |
parent | de3c440e8a54c201c527b85da7b89d58486ece4d (diff) | |
download | edk2-ded3c57623b5ddc0045aa3633fd7df0907b6ebd3.tar.gz edk2-ded3c57623b5ddc0045aa3633fd7df0907b6ebd3.tar.bz2 edk2-ded3c57623b5ddc0045aa3633fd7df0907b6ebd3.zip |
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>
-rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index d8fbf14e8f..9928919bf5 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -130,6 +130,15 @@ gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
!endif
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
+ gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
+
+ #
+ # The maximum physical I/O addressability of the processor, set with
+ # BuildCpuHob().
+ #
+ gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
+
[PcdsPatchableInModule.common]
#
# This will be overridden in the code
@@ -146,17 +155,6 @@ gArmTokenSpaceGuid.PcdFdBaseAddress|0x0
gArmTokenSpaceGuid.PcdFvBaseAddress|0x0
-[PcdsFixedAtBuild.AARCH64]
-
- gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
- gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
-
- #
- # The maximum physical I/O addressability of the processor, set with
- # BuildCpuHob().
- #
- gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
-
[PcdsDynamicDefault.common]
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3
|