diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2016-01-29 19:06:47 +0000 |
|---|---|---|
| committer | lersek <lersek@Edk2> | 2016-01-29 19:06:47 +0000 |
| commit | e3dca1859b2453b9941c66d704bc49d63d9b8d68 (patch) | |
| tree | 775fbcff3bfd952816fe7eb1233b49edf174e605 | |
| parent | d0b2d190829a1dabdf5835c56665f95bc864d9cf (diff) | |
| download | edk2-platforms-e3dca1859b2453b9941c66d704bc49d63d9b8d68.tar.xz | |
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
| -rw-r--r-- | OvmfPkg/OvmfPkg.fdf.inc | 6 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32.fdf | 12 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32X64.fdf | 12 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgX64.fdf | 12 | ||||
| -rw-r--r-- | OvmfPkg/README | 4 |
5 files changed, 8 insertions, 38 deletions
diff --git a/OvmfPkg/OvmfPkg.fdf.inc b/OvmfPkg/OvmfPkg.fdf.inc index 441c35acfa..9cc0578d64 100644 --- a/OvmfPkg/OvmfPkg.fdf.inc +++ b/OvmfPkg/OvmfPkg.fdf.inc @@ -15,6 +15,12 @@ #
##
+#
+# Default flash size is 2MB.
+#
+# Defining FD_SIZE_1MB on the build command line can override this.
+#
+
DEFINE BLOCK_SIZE = 0x1000
DEFINE VARS_SIZE = 0x20000
DEFINE VARS_BLOCKS = 0x20
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 1c1936c701..e3cbf74a9f 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -15,19 +15,7 @@ ################################################################################
-#
-# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.
-#
-# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can
-# override this.
-#
[Defines]
-!if $(TARGET) == RELEASE
-!ifndef $(FD_SIZE_2MB)
-DEFINE FD_SIZE_1MB=
-!endif
-!endif
-
!include OvmfPkg.fdf.inc
#
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index ffed58a267..b60d93b715 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -15,19 +15,7 @@ ################################################################################
-#
-# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.
-#
-# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can
-# override this.
-#
[Defines]
-!if $(TARGET) == RELEASE
-!ifndef $(FD_SIZE_2MB)
-DEFINE FD_SIZE_1MB=
-!endif
-!endif
-
!include OvmfPkg.fdf.inc
#
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index ae9f348126..d8b119a8f2 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -15,19 +15,7 @@ ################################################################################
-#
-# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.
-#
-# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can
-# override this.
-#
[Defines]
-!if $(TARGET) == RELEASE
-!ifndef $(FD_SIZE_2MB)
-DEFINE FD_SIZE_1MB=
-!endif
-!endif
-
!include OvmfPkg.fdf.inc
#
diff --git a/OvmfPkg/README b/OvmfPkg/README index e6137ddc1f..c0fe4ac2de 100644 --- a/OvmfPkg/README +++ b/OvmfPkg/README @@ -231,8 +231,8 @@ longer.) - Install the drivers into a directory called Intel3.5 in your WORKSPACE.
- Include the driver in OVMF during the build:
- - Add "-D E1000_ENABLE -D FD_SIZE_2MB" to your build command,
- - For example: "build -D E1000_ENABLE -D FD_SIZE_2MB".
+ - Add "-D E1000_ENABLE" to your build command,
+ - For example: "build -D E1000_ENABLE".
* When a matching iPXE driver is configured for a NIC as described above, it
takes priority over other drivers that could possibly drive the card too:
|