ARM Package: Increase FV file size for some EDK2 firmware

GCC47 generates bigger binaries in Debug build than GCC46.

This large increase is considered as a regression.
It will require some investigation to understand the reason
of this increase in size.

The size of the FV has been increased to allow developers to
build these images with the current BaseTools.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14611 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmPlatformPkg.fdf b/ArmPlatformPkg/ArmPlatformPkg.fdf
index 41f6256eec15936f63a86396d9f3bdeb1680ead3..d7355d7dca17dbaf684ab37643c8f368bf9131cb 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.fdf
+++ b/ArmPlatformPkg/ArmPlatformPkg.fdf
@@ -26,9 +26,9 @@
 \r
 [FD.Sec_ArmPlatform_EFI]\r
 BaseAddress   = 0xEC000000|gArmTokenSpaceGuid.PcdSecureFdBaseAddress  #The base address of the Secure FLASH Device.\r
-Size          = 0x00015000|gArmTokenSpaceGuid.PcdSecureFdSize         #The size in bytes of the Secure FLASH Device\r
+Size          = 0x00020000|gArmTokenSpaceGuid.PcdSecureFdSize         #The size in bytes of the Secure FLASH Device\r
 ErasePolarity = 1\r
-BlockSize     = 0x00001500\r
+BlockSize     = 0x00002000\r
 NumBlocks     = 0x10\r
 \r
 ################################################################################\r
@@ -47,7 +47,7 @@ NumBlocks     = 0x10
 #\r
 ################################################################################\r
 \r
-0x00000000|0x00015000\r
+0x00000000|0x00020000\r
 gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize\r
 FV = FVMAIN_SEC\r
 \r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 8f6e404caf51c53208f40cf33f7043712cdd40b5..babadd87e93f0b94eb66e3e5c34e5e5917b79441 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
@@ -28,10 +28,10 @@
 \r
 [FD.ArmRealViewEb_EFI]\r
 BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
-Size          = 0x00150000|gArmTokenSpaceGuid.PcdFdSize\r
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x00010000\r
-NumBlocks     = 0x15\r
+NumBlocks     = 0x20\r
 \r
 ################################################################################\r
 #\r
@@ -53,7 +53,7 @@ NumBlocks     = 0x15
 gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize\r
 FV = FVMAIN_SEC\r
 \r
-0x00050000|0x00100000\r
+0x00050000|0x00150000\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index d235cb888b2540ebbcf8126a769f27d98c8f245d..2e8ae2f500052c896a163208339c31c2e34e6ce9 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -29,10 +29,10 @@
 \r
 [FD.ArmRealViewEb_EFI]\r
 BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
-Size          = 0x00150000|gArmTokenSpaceGuid.PcdFdSize\r
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x00010000\r
-NumBlocks     = 0x15\r
+NumBlocks     = 0x20\r
 \r
 ################################################################################\r
 #\r
@@ -54,7 +54,7 @@ NumBlocks     = 0x15
 gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize\r
 FV = FVMAIN_SEC\r
 \r
-0x00050000|0x00100000\r
+0x00050000|0x00150000\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r

diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index 1bb593dfbe2926a98e81140f07a7fe25c09d6cf9..5b3573d9d768be7b25ec32464845dbeae05e1b1f 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -28,10 +28,10 @@
 \r
 [FD.BeagleBoard_EFI]\r
 BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.\r
-Size          = 0x000A0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device\r
+Size          = 0x000B0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 BlockSize     = 0x1\r
-NumBlocks     = 0xA0000\r
+NumBlocks     = 0xB0000\r
 \r
 ################################################################################\r
 #\r
@@ -48,7 +48,7 @@ NumBlocks     = 0xA0000
 # RegionType <FV, DATA, or FILE>\r
 #\r
 ################################################################################\r
-0x00000000|0x000A0000\r
+0x00000000|0x000B0000\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r