OvmfPkg: Carve 128KB out of MAINFV in MEMFD

In an effort to consolidate fixed memory used by OVMF,
we'll move 2 SEC/PEI phase RAM users to 8MB.
* X64 page tables (24KB)   0x80000 => 0x800000
* PEI temporary RAM (64KB) 0x70000 => 0x810000

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15144 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index c6e186f26d772af17ca629395453949e6408b4f7..1c5c74664dc67218549da8da5cbbfae3b16b0e7a 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -129,13 +129,14 @@ FV = SECFV
 ################################################################################\r
 \r
 [FD.MEMFD]\r
-BaseAddress   = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size          = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+BaseAddress   = 0x800000\r
+Size          = 0x800000\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
 NumBlocks     = 0x80\r
 \r
-0x0|0x800000\r
+0x020000|0x7E0000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
 FV = MAINFV\r
 \r
 ################################################################################\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 615451dbec9da5c1f485a57a95dfb12c3f3bedb5..25d36107c0dceff7d1d4b33d4b5e06988d885724 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -129,13 +129,14 @@ FV = SECFV
 ################################################################################\r
 \r
 [FD.MEMFD]\r
-BaseAddress   = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size          = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+BaseAddress   = 0x800000\r
+Size          = 0x800000\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
 NumBlocks     = 0x80\r
 \r
-0x0|0x800000\r
+0x020000|0x7E0000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
 FV = MAINFV\r
 \r
 ################################################################################\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 911fe0898bbbf50e68298b413ab42778d3ed893e..a97b2c26a799d1dfb3b315a6614ea813f0adf657 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -129,13 +129,14 @@ FV = SECFV
 ################################################################################\r
 \r
 [FD.MEMFD]\r
-BaseAddress   = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size          = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+BaseAddress   = 0x800000\r
+Size          = 0x800000\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
 NumBlocks     = 0x80\r
 \r
-0x0|0x800000\r
+0x020000|0x7E0000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
 FV = MAINFV\r
 \r
 ################################################################################\r