OvmfPkg: make the 4MB flash size the default (again)

Xen gained support for the 4MB flash image in Xen commit 0d6968635ce5
("hvmloader: avoid tests when they would clobber used memory",
2017-05-19), which is part of Xen 4.9.0-rc6.

The previously default 2MB can be explicitly selected with

  -D FD_SIZE_2MB

or

  -D FD_SIZE_IN_KB=2048

Cc: Jordan Justen <jordan.l.justen@intel.com>
Suggested-by: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
(cherry picked from commit bba8dfbec3bbc4fba7fa6398ba3cf76593e0725e)
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
[lersek@redhat.com: reference Xen commit in commit message]
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index a0ea5db55c27dee4d427b43437d370a324b67107..0647f346257a30f5f065faea94d2dc1fd14bcbff 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -54,7 +54,7 @@
 !ifdef $(FD_SIZE_4MB)\r
   DEFINE FD_SIZE_IN_KB           = 4096\r
 !else\r
-  DEFINE FD_SIZE_IN_KB           = 2048\r
+  DEFINE FD_SIZE_IN_KB           = 4096\r
 !endif\r
 !endif\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 9ab58aa9d1541007223e75a636d6895b60c2736b..1182b1858a7dd19aab599aa4af0e9d0efcc125de 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -54,7 +54,7 @@
 !ifdef $(FD_SIZE_4MB)\r
   DEFINE FD_SIZE_IN_KB           = 4096\r
 !else\r
-  DEFINE FD_SIZE_IN_KB           = 2048\r
+  DEFINE FD_SIZE_IN_KB           = 4096\r
 !endif\r
 !endif\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 88060cdae539795f0da69798a220498d47046582..636dfb1b5638d0faaef09082162ad17c016cd8fe 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -54,7 +54,7 @@
 !ifdef $(FD_SIZE_4MB)\r
   DEFINE FD_SIZE_IN_KB           = 4096\r
 !else\r
-  DEFINE FD_SIZE_IN_KB           = 2048\r
+  DEFINE FD_SIZE_IN_KB           = 4096\r
 !endif\r
 !endif\r
 !endif\r