OvmfPkg: Increase default RELEASE build image size to 2MB

Fixes: https://github.com/tianocore/edk2/issues/47
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Bruce Cran <bruce@cran.org.uk>
Cc: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19775 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/OvmfPkg.fdf.inc b/OvmfPkg/OvmfPkg.fdf.inc
index 441c35acfa5cf10bcfc71e4944d0a83b07400fc0..9cc0578d64303cee912525a501290368d59e7af6 100644 (file)
--- a/OvmfPkg/OvmfPkg.fdf.inc
+++ b/OvmfPkg/OvmfPkg.fdf.inc
@@ -15,6 +15,12 @@
 #\r
 ##\r
 \r
+#\r
+# Default flash size is 2MB.\r
+#\r
+# Defining FD_SIZE_1MB on the build command line can override this.\r
+#\r
+\r
 DEFINE BLOCK_SIZE        = 0x1000\r
 DEFINE VARS_SIZE         = 0x20000\r
 DEFINE VARS_BLOCKS       = 0x20\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 1c1936c7013b0ec57e386b9d48d3b2d1efa23085..e3cbf74a9f602af17f085a0734d8587e53daceed 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -15,19 +15,7 @@
 \r
 ################################################################################\r
 \r
-#\r
-# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.\r
-#\r
-# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can\r
-# override this.\r
-#\r
 [Defines]\r
-!if $(TARGET) == RELEASE\r
-!ifndef $(FD_SIZE_2MB)\r
-DEFINE FD_SIZE_1MB=\r
-!endif\r
-!endif\r
-\r
 !include OvmfPkg.fdf.inc\r
 \r
 #\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index ffed58a2672d332ea9312116c3743c121746eccf..b60d93b71592094d7c33233bcf88499a0e49bfb3 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -15,19 +15,7 @@
 \r
 ################################################################################\r
 \r
-#\r
-# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.\r
-#\r
-# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can\r
-# override this.\r
-#\r
 [Defines]\r
-!if $(TARGET) == RELEASE\r
-!ifndef $(FD_SIZE_2MB)\r
-DEFINE FD_SIZE_1MB=\r
-!endif\r
-!endif\r
-\r
 !include OvmfPkg.fdf.inc\r
 \r
 #\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index ae9f348126f6e4540e50c2ddbd320812a51305ec..d8b119a8f29892bfd08a6a40881db257e54a810b 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -15,19 +15,7 @@
 \r
 ################################################################################\r
 \r
-#\r
-# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.\r
-#\r
-# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can\r
-# override this.\r
-#\r
 [Defines]\r
-!if $(TARGET) == RELEASE\r
-!ifndef $(FD_SIZE_2MB)\r
-DEFINE FD_SIZE_1MB=\r
-!endif\r
-!endif\r
-\r
 !include OvmfPkg.fdf.inc\r
 \r
 #\r

diff --git a/OvmfPkg/README b/OvmfPkg/README
index e6137ddc1f3695f07471d93fe53bb2a8829f43f0..c0fe4ac2dec15cf06115866fa3346174c2636309 100644 (file)
--- a/OvmfPkg/README
+++ b/OvmfPkg/README
@@ -231,8 +231,8 @@ longer.)
     - Install the drivers into a directory called Intel3.5 in your WORKSPACE.\r
 \r
   - Include the driver in OVMF during the build:\r
-    - Add "-D E1000_ENABLE -D FD_SIZE_2MB" to your build command,\r
-    - For example: "build -D E1000_ENABLE -D FD_SIZE_2MB".\r
+    - Add "-D E1000_ENABLE" to your build command,\r
+    - For example: "build -D E1000_ENABLE".\r
 \r
 * When a matching iPXE driver is configured for a NIC as described above, it\r
   takes priority over other drivers that could possibly drive the card too:\r