Here is a patch that by default keeps the current 1MB FD sizes. If FD_SIZE_2MB is...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13782 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index f819e6b59bbd6b8a367ed116673c03a10a62269e..563b1bb650ecfbe6d6da28afaa829f9fa67ff447 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -14,6 +14,7 @@
 ##\r
 \r
 ################################################################################\r
+!ifndef $(FD_SIZE_2MB)\r
 [FD.OVMF]\r
 BaseAddress   = 0xFFF00000\r
 Size          = 0x00100000\r
@@ -26,6 +27,20 @@ FV = FVMAIN_COMPACT
 \r
 0x000EC000|0x14000\r
 FV = SECFV\r
+!else\r
+[FD.OVMF]\r
+BaseAddress   = 0xFFE00000\r
+Size          = 0x00200000\r
+ErasePolarity = 1\r
+BlockSize     = 0x1000\r
+NumBlocks     = 0x200\r
+\r
+0x00000000|0x001CC000\r
+FV = FVMAIN_COMPACT\r
+\r
+0x001CC000|0x34000\r
+FV = SECFV\r
+!endif\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 399f01321c4e1a2434b3f2c161cfe5cd252367b0..4721368824881433041ca66ef69c7c2b0ca553c2 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -14,6 +14,7 @@
 ##\r
 \r
 ################################################################################\r
+!ifndef $(FD_SIZE_2MB)\r
 [FD.OVMF]\r
 BaseAddress   = 0xFFF00000\r
 Size          = 0x00100000\r
@@ -26,6 +27,20 @@ FV = FVMAIN_COMPACT
 \r
 0x000EC000|0x14000\r
 FV = SECFV\r
+!else\r
+[FD.OVMF]\r
+BaseAddress   = 0xFFE00000\r
+Size          = 0x00200000\r
+ErasePolarity = 1\r
+BlockSize     = 0x1000\r
+NumBlocks     = 0x200\r
+\r
+0x00000000|0x001CC000\r
+FV = FVMAIN_COMPACT\r
+\r
+0x001CC000|0x34000\r
+FV = SECFV\r
+!endif\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 74ae134cd5f687b7df119918605a9c7e777497c5..d74043dfc78c19a39bd13a44c841971626f095fe 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -14,6 +14,7 @@
 ##\r
 \r
 ################################################################################\r
+!ifndef $(FD_SIZE_2MB)\r
 [FD.OVMF]\r
 BaseAddress   = 0xFFF00000\r
 Size          = 0x00100000\r
@@ -26,6 +27,20 @@ FV = FVMAIN_COMPACT
 \r
 0x000E6000|0x1A000\r
 FV = SECFV\r
+!else\r
+[FD.OVMF]\r
+BaseAddress   = 0xFFE00000\r
+Size          = 0x00200000\r
+ErasePolarity = 1\r
+BlockSize     = 0x1000\r
+NumBlocks     = 0x200\r
+\r
+0x00000000|0x001CC000\r
+FV = FVMAIN_COMPACT\r
+\r
+0x001CC000|0x34000\r
+FV = SECFV\r
+!endif\r
 \r
 ################################################################################\r
 \r