EmbeddedPkg/EmbeddedPkg.dec: Defined default values for PcdPrePiCpuMemorySize & PcdPr...

This change introduces default values for the PCDs PcdPrePiCpuMemorySize & PcdPrePiCpuIoSize.
These values are for the architectures ARM, AARCH64, IA32 and X64.

The redefinition of these PCDs (with the same default values) have been removed from the DSC files.

Note: the default value for AARCH64 was 32. It was preventing to allocate buffer above the 32bit
address space.

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@14914 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
index c6cef797b16bb323ea3e7fb0d426a9d37b87552f..264099c7b40ff1e7fb9b05151093c2bcb7e98bdd 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
@@ -225,8 +225,6 @@
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Platform"\r
   \r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ArmPlatform"\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index 2221b88f33d83118af8fd07a6c87964fa199a00f..ce31abcdcc4a93dfbea842d07a0d011a15c51a98 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -258,8 +258,6 @@
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Platform"\r
   \r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ArmPlatform"\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
index 97ee9123a128f10a8e73f4b59b407ca491c74fc9..3fb099ea6da3468f57fda5dc10c4999faf6bb6a4 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
@@ -229,8 +229,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE\r
 \r
 [PcdsFixedAtBuild.common]\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index 93e541239c1b9dd777ba7f3d87004dbaa609d005..7d405379e60485af79e3ecf713607cf904eec16c 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -251,8 +251,6 @@
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"\r
   \r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 1223944bed36fb1d953713aded7f5b30a76a626b..07b8c4719882ac5848b5677b164439d0ccbd775f 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -257,8 +257,6 @@
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Beagle Board"\r
   \r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"BeagleEdk2"\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000\r

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index f4cf1b312b12a392dc75ae20080e286c104f68c1..1b8ef158afe4f1571885ced0629f49297aefb2a6 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -82,8 +82,6 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|131072|UINT32|0x00000040\r
   gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0|UINT32|0x0000000b\r
   gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|131072|UINT32|0x0000000c\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32|UINT8|0x00000010\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011\r
   \r
   gEmbeddedTokenSpaceGuid.PcdMemoryBase|0x0|UINT32|0x0000004e\r
   gEmbeddedTokenSpaceGuid.PcdMemorySize|0x0|UINT32|0x0000004f\r
@@ -126,6 +124,19 @@
   gEmbeddedTokenSpaceGuid.PcdGdbUartPort|0x3f8|UINT32|0x0000004b\r
   gEmbeddedTokenSpaceGuid.PcdGdbMaxPacketRetryCount|10000000|UINT32|0x0000004c\r
   gEmbeddedTokenSpaceGuid.PcdGdbTimerPeriodMilliseconds|250|UINT32|0x0000004d\r
-  \r
-  \r
 \r
+[PcdsFixedAtBuild.ARM]\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32|UINT8|0x00000010\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011\r
+\r
+[PcdsFixedAtBuild.AARCH64]\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011\r
+\r
+[PcdsFixedAtBuild.IA32]\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011\r
+\r
+[PcdsFixedAtBuild.X64]\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|52|UINT8|0x00000010\r
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011\r

diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index 6c9d05a25fa9ae6cf1d80520149a87e33f277339..908b819479d04a6088e9ae7889b8b4517fea4419 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -202,21 +202,6 @@
   gEmbeddedTokenSpaceGuid.PcdTimerVector|7\r
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000\r
 \r
-\r
-[PcdsFixedAtBuild.ARM]\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0\r
-\r
-[PcdsFixedAtBuild.IA32]\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
-\r
-[PcdsFixedAtBuild.X64]\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|52\r
-  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
-\r
-\r
-\r
 [PcdsFixedAtBuild.IPF]\r
   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000\r
 \r