OvmfPkg: introduce the FD_SIZE_IN_KB macro / build flag

[mirror_edk2.git] / OvmfPkg / OvmfPkg.fdf.inc

diff --git a/OvmfPkg/OvmfPkg.fdf.inc b/OvmfPkg/OvmfPkg.fdf.inc
index 9cc0578d64303cee912525a501290368d59e7af6..f12d61c2b682005080d0685c47a22e591ce11cde 100644 (file)
--- a/OvmfPkg/OvmfPkg.fdf.inc
+++ b/OvmfPkg/OvmfPkg.fdf.inc
@@ -15,18 +15,11 @@
 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

-#\r
-# Default flash size is 2MB.\r
-#\r
-# Defining FD_SIZE_1MB on the build command line can override this.\r
-#\r
-\r

 DEFINE BLOCK_SIZE        = 0x1000\r
 DEFINE VARS_SIZE         = 0x20000\r
 DEFINE VARS_BLOCKS       = 0x20\r
 \r
 DEFINE BLOCK_SIZE        = 0x1000\r
 DEFINE VARS_SIZE         = 0x20000\r
 DEFINE VARS_BLOCKS       = 0x20\r
 \r

-!ifdef $(FD_SIZE_1MB)\r
-\r
+!if $(FD_SIZE_IN_KB) == 1024\r

 DEFINE FW_BASE_ADDRESS   = 0xFFF00000\r
 DEFINE FW_SIZE           = 0x00100000\r
 DEFINE FW_BLOCKS         = 0x100\r
 DEFINE FW_BASE_ADDRESS   = 0xFFF00000\r
 DEFINE FW_SIZE           = 0x00100000\r
 DEFINE FW_BLOCKS         = 0x100\r


@@ -36,9 +29,9 @@ DEFINE CODE_BLOCKS       = 0xE0
 DEFINE FVMAIN_SIZE       = 0x000CC000\r
 DEFINE SECFV_OFFSET      = 0x000EC000\r
 DEFINE SECFV_SIZE        = 0x14000\r
 DEFINE FVMAIN_SIZE       = 0x000CC000\r
 DEFINE SECFV_OFFSET      = 0x000EC000\r
 DEFINE SECFV_SIZE        = 0x14000\r

+!endif\r

 \r
 \r

-!else\r
-\r
+!if $(FD_SIZE_IN_KB) == 2048\r

 DEFINE FW_BASE_ADDRESS   = 0xFFE00000\r
 DEFINE FW_SIZE           = 0x00200000\r
 DEFINE FW_BLOCKS         = 0x200\r
 DEFINE FW_BASE_ADDRESS   = 0xFFE00000\r
 DEFINE FW_SIZE           = 0x00200000\r
 DEFINE FW_BLOCKS         = 0x200\r


@@ -48,7 +41,6 @@ DEFINE CODE_BLOCKS       = 0x1E0
 DEFINE FVMAIN_SIZE       = 0x001AC000\r
 DEFINE SECFV_OFFSET      = 0x001CC000\r
 DEFINE SECFV_SIZE        = 0x34000\r
 DEFINE FVMAIN_SIZE       = 0x001AC000\r
 DEFINE SECFV_OFFSET      = 0x001CC000\r
 DEFINE SECFV_SIZE        = 0x34000\r

-\r

 !endif\r
 \r
 SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress     = $(FW_BASE_ADDRESS)\r
 !endif\r
 \r
 SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress     = $(FW_BASE_ADDRESS)\r