ArmVirtPkg: increase FD/FV size for NOOPT builds

[mirror_edk2.git] / ArmVirtPkg / ArmVirtXen.fdf

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 79f681cde0286c8a20a2cdb4dffe39f639f40eb2..38d4cc1635246e082a026b7b5b8960e7307d1eb1 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -20,14 +20,22 @@
 #\r
 ################################################################################\r
 \r
+[Defines]\r
+!if $(FD_SIZE_IN_MB) == 2\r
+  DEFINE FVMAIN_COMPACT_SIZE  = 0x1fe000\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  DEFINE FVMAIN_COMPACT_SIZE  = 0x2fe000\r
+!endif\r
+\r
 [FD.XEN_EFI]\r
 BaseAddress   = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
+Size          = $(FD_SIZE)|gArmTokenSpaceGuid.PcdFdSize\r
 ErasePolarity = 1\r
 \r
 # This one is tricky, it must be: BlockSize * NumBlocks = Size\r
 BlockSize     = 0x00001000\r
-NumBlocks     = 0x200\r
+NumBlocks     = $(FD_NUM_BLOCKS)\r
 \r
 ################################################################################\r
 #\r
@@ -56,7 +64,12 @@ DATA = {
   0x01, 0x00, 0x00, 0x10,                         # code0: adr x1, .\r
   0xff, 0x07, 0x00, 0x14,                         # code1: b 0x2000\r
   0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, # text_offset: 512 KB\r
+!if $(FD_SIZE_IN_MB) == 2\r
   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 2 MB\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 3 MB\r
+!endif\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # flags\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res2\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res3\r
@@ -76,12 +89,17 @@ DATA = {
   0xf6, 0x07, 0x00, 0xea, # b 0x2000\r
   0x18, 0x28, 0x6f, 0x01, # magic\r
   0x00, 0x00, 0x00, 0x00, # start\r
+!if $(FD_SIZE_IN_MB) == 2\r
   0x00, 0x00, 0x20, 0x00, # image size: 2 MB\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  0x00, 0x00, 0x30, 0x00, # image size: 3 MB\r
+!endif\r
   0x01, 0x02, 0x03, 0x04  # endiannness flag\r
 !endif\r
 }\r
 \r
-0x00002000|0x001fe000\r
+0x00002000|$(FVMAIN_COMPACT_SIZE)\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r