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 <[email protected]> Reviewed-by: Laszlo Ersek <[email protected]> --- OvmfPkg/OvmfPkgIa32.fdf | 14 ++++++++++++++ OvmfPkg/OvmfPkgIa32X64.fdf | 14 ++++++++++++++ OvmfPkg/OvmfPkgX64.fdf | 14 ++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index df4f227..40f0651 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -14,7 +14,21 @@ ## ################################################################################ + +# +# 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 + +!ifdef $(FD_SIZE_1MB) [FD.OVMF] BaseAddress = 0xFFF00000 Size = 0x00100000 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index d93a7ff..f5fa4ed 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -14,7 +14,21 @@ ## ################################################################################ + +# +# 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 + +!ifdef $(FD_SIZE_1MB) [FD.OVMF] BaseAddress = 0xFFF00000 Size = 0x00100000 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index deee977..329e989 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -14,7 +14,21 @@ ## ################################################################################ + +# +# 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 + +!ifdef $(FD_SIZE_1MB) [FD.OVMF] BaseAddress = 0xFFF00000 Size = 0x00100000 -- 1.7.10.4 ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
