summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--OvmfPkg/OvmfPkg.fdf.inc6
-rw-r--r--OvmfPkg/OvmfPkgIa32.fdf12
-rw-r--r--OvmfPkg/OvmfPkgIa32X64.fdf12
-rw-r--r--OvmfPkg/OvmfPkgX64.fdf12
-rw-r--r--OvmfPkg/README4
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: