ArmVirtPkg: drop PcdPrePiCpuMemorySize assignments from all platforms

PcdPrePiCpuMemorySize is no longer used so drop the PCD overrides
from all platform descriptions in ArmVirtPkg.

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/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 70a0ac4d786c05ae60e81d880d7125b32bd51ac1..fbdb5c9826048980651647a2471a34e8399393f7 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -388,9 +388,6 @@
   #\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE\r
 \r
   #\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE\r
 \r

-[PcdsFixedAtBuild.ARM]\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40\r
-\r

 [Components.common]\r
   #\r
   # Ramdisk support\r
 [Components.common]\r
   #\r
   # Ramdisk support\r

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 885c6b14b84402d4edcd9e7cbbc71b46345d6c8c..a107b6bb510411d39cdb6d284ee44c6e231eb77e 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -143,10 +143,6 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
 \r
 [PcdsFixedAtBuild.AARCH64]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
 \r
 [PcdsFixedAtBuild.AARCH64]\r

-  # KVM limits it IPA space to 40 bits (1 TB), so there is no need to\r
-  # support anything bigger, even if the host hardware does\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40\r
-\r

   # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,\r
   # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the\r
   # presence of the 32-bit entry point anyway (because many AARCH64 systems\r
   # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,\r
   # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the\r
   # presence of the 32-bit entry point anyway (because many AARCH64 systems\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 434d6861a56ff24c19d4c94ca9cdb2c4321fea68..d8fbf14e8f4e7cd3b20838fd3a3b52d17d0341ed 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -157,10 +157,6 @@
   #\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
 \r
   #\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
 \r

-  # KVM limits it IPA space to 40 bits (1 TB), so there is no need to\r
-  # support anything bigger, even if the host hardware does\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40\r
-\r

 [PcdsDynamicDefault.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
 [PcdsDynamicDefault.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r