| Message ID | 1434447840-28715-1-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 16 June 2015 at 16:23, Laszlo Ersek <lersek@redhat.com> wrote: > On 06/16/15 11:44, Ard Biesheuvel wrote: >> This is a followup to r17554 ("ArmVirtPkg: increase memory >> preallocations to reduce region count") that increases the sizes >> of the preallocated regions to account for the footprint of the >> crypto and authentication libraries. This is only done if secure >> boot is enabled at build time, to prevent imposing a larger minimum >> RAM size on non-secure builds. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> --- >> ArmVirtPkg/ArmVirt.dsc.inc | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc >> index 9c737712d45f..c6e684fd8512 100644 >> --- a/ArmVirtPkg/ArmVirt.dsc.inc >> +++ b/ArmVirtPkg/ArmVirt.dsc.inc >> @@ -329,9 +329,15 @@ [PcdsFixedAtBuild.common] >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0 >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0 >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0 >> +!if $(SECURE_BOOT_ENABLE) == TRUE >> + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|600 >> + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|400 >> + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1500 >> +!else >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|300 >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|150 >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1000 >> +!endif >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData|20000 >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 >> gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0 >> > > Reviewed-by: Laszlo Ersek <lersek@redhat.com> > Thanks guys. Committed as r17646
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 9c737712d45f..c6e684fd8512 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -329,9 +329,15 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0 +!if $(SECURE_BOOT_ENABLE) == TRUE + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|600 + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|400 + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1500 +!else gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|300 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|150 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1000 +!endif gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData|20000 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0
This is a followup to r17554 ("ArmVirtPkg: increase memory preallocations to reduce region count") that increases the sizes of the preallocated regions to account for the footprint of the crypto and authentication libraries. This is only done if secure boot is enabled at build time, to prevent imposing a larger minimum RAM size on non-secure builds. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmVirtPkg/ArmVirt.dsc.inc | 6 ++++++ 1 file changed, 6 insertions(+)