OvmfPkg: Increase DEBUG build size to 2MB by default

The 1MB image with full debug and the shell included is too
large to implement flash based non-volatile variable.

After this change, building with -D FD_SIZE_1MB will
force the smaller flash size.

The default size for RELEASE build remains at 1MB, so using
-b RELEASE on the build command line will result in a
1MB flash size. For RELEASE builds -D FD_SIZE_2MB can be
used to produce a 2MB flash image.

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@14833 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index df4f2276eefec76e6acc58e0aa2410622b2939af..40f06512448de5d79f1758016a2f881ebd99490c 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -14,7 +14,21 @@
 ##\r
 \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
+!ifdef $(FD_SIZE_1MB)\r
 [FD.OVMF]\r
 BaseAddress   = 0xFFF00000\r
 Size          = 0x00100000\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index d93a7ff2e5877d7e4c84c0a441aac5c721fbad91..f5fa4ed261ccd206eef431cbcf89cb8acd08a6ab 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -14,7 +14,21 @@
 ##\r
 \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
+!ifdef $(FD_SIZE_1MB)\r
 [FD.OVMF]\r
 BaseAddress   = 0xFFF00000\r
 Size          = 0x00100000\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index deee977271abbda41ea8b65bc34411ea5d47b01c..329e98959bc48fe25dac84104b4d8d904158a8bc 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -14,7 +14,21 @@
 ##\r
 \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
+!ifdef $(FD_SIZE_1MB)\r
 [FD.OVMF]\r
 BaseAddress   = 0xFFF00000\r
 Size          = 0x00100000\r