diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2018-05-28 18:20:39 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2018-05-29 10:13:36 +0200 |
| commit | d272449d9e1ed08aaeea83c2202913e6a523d8a8 (patch) | |
| tree | 765b6c84e29af83b301f5e4704caa9372ce1ab06 /OvmfPkg/OvmfPkgX64.fdf | |
| parent | 6c7ac681f4bef931106786bae9eee141ab7503ca (diff) | |
| download | edk2-d272449d9e1ed08aaeea83c2202913e6a523d8a8.zip edk2-d272449d9e1ed08aaeea83c2202913e6a523d8a8.tar.gz edk2-d272449d9e1ed08aaeea83c2202913e6a523d8a8.tar.bz2 | |
OvmfPkg: raise DXEFV size to 11 MB
Almost exactly two years after commit 2f7b34b20842f, we've grown out the
10MB DXEFV:
> build -a IA32 -a X64 -p OvmfPkg/OvmfPkgIa32X64.dsc -b NOOPT -t GCC48 \
> -D SMM_REQUIRE -D SECURE_BOOT_ENABLE -D TLS_ENABLE -D E1000_ENABLE \
> -D HTTP_BOOT_ENABLE -D NETWORK_IP6_ENABLE
>
> [...]
>
> GenFv: ERROR 3000: Invalid
> the required fv image size 0xa28d48 exceeds the set fv image size
> 0xa00000
Raise the DXEFV size to 11MB.
(For builds that don't need this DXEFV bump, I've checked the
FVMAIN_COMPACT increase stemming from the additional 1MB padding, using
NOOPT + GCC48 + FD_SIZE_2MB, and no other "-D" flags. In the IA32 build,
FVMAIN_COMPACT grows by 232 bytes. In the IA32X64 build, FVMAIN_COMPACT
shrinks by 64 bytes. In the X64 build, FVMAIN_COMPACT shrinks by 376
bytes.)
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Lin <glin@suse.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Gary Lin <glin@suse.com>
Diffstat (limited to 'OvmfPkg/OvmfPkgX64.fdf')
| -rw-r--r-- | OvmfPkg/OvmfPkgX64.fdf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 2e2a174..9ca96f9 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -68,10 +68,10 @@ FV = SECFV [FD.MEMFD]
BaseAddress = $(MEMFD_BASE_ADDRESS)
-Size = 0xB00000
+Size = 0xC00000
ErasePolarity = 1
BlockSize = 0x10000
-NumBlocks = 0xB0
+NumBlocks = 0xC0
0x000000|0x006000
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize
@@ -89,7 +89,7 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.P gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize
FV = PEIFV
-0x100000|0xA00000
+0x100000|0xB00000
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize
FV = DXEFV
|