ArmPlatformPkg: Fixed size of RTSM FDs

The size of the FDs did not match the FD layout.

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@14426 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 70fc87bcf53c2e55d80c34cf37ed9c75d8959ebe..8f6e404caf51c53208f40cf33f7043712cdd40b5 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
@@ -1,6 +1,6 @@
-# FLASH layout file for ARM VE.\r
+# FLASH layout file for ARM RealView EB.\r
 #\r
-#  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -28,10 +28,10 @@
 \r
 [FD.ArmRealViewEb_EFI]\r
 BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
+Size          = 0x00150000|gArmTokenSpaceGuid.PcdFdSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x00010000\r
-NumBlocks     = 0x20\r
+NumBlocks     = 0x15\r
 \r
 ################################################################################\r
 #\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index c1cd07eab1ebf6d901a85faa9311312ba305f6d2..d235cb888b2540ebbcf8126a769f27d98c8f245d 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -1,6 +1,7 @@
 # FLASH layout file for ARM RealView EB.\r
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -28,10 +29,10 @@
 \r
 [FD.ArmRealViewEb_EFI]\r
 BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
+Size          = 0x00150000|gArmTokenSpaceGuid.PcdFdSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x00010000\r
-NumBlocks     = 0x20\r
+NumBlocks     = 0x15\r
 \r
 ################################################################################\r
 #\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index c961897d007066b639a1951d3d68473d1b7657bf..af42aefa9a6649f4485839bc8a82df7f6f322cdf 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
@@ -27,12 +27,12 @@
 \r
 [FD.RTSM_VE_Cortex-A15_EFI]\r
 BaseAddress   = 0x08000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.\r
-Size          = 0x00280000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
+Size          = 0x00300000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 \r
 # This one is tricky, it must be: BlockSize * NumBlocks = Size\r
 BlockSize     = 0x00001000\r
-NumBlocks     = 0x280\r
+NumBlocks     = 0x300\r
 \r
 ################################################################################\r
 #\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index 58170490ac4928c8d30d1ec61f29110baa58536e..24e55751d51936c7a7ea89ae273cc0c9601947ad 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
@@ -27,12 +27,12 @@
 \r
 [FD.RTSM_VE_Cortex-A15_MPCore_EFI]\r
 BaseAddress   = 0x08000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.\r
-Size          = 0x00280000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
+Size          = 0x00300000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 \r
 # This one is tricky, it must be: BlockSize * NumBlocks = Size\r
 BlockSize     = 0x00001000\r
-NumBlocks     = 0x280\r
+NumBlocks     = 0x300\r
 \r
 ################################################################################\r
 #\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index 743c88c8dba3f31d5e2bfb8108b780fb4cee7cec..728eb785046bd73ceef3e38e73696bc164c45130 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -26,12 +26,12 @@
 \r
 [FD.RTSM_VE_Cortex-A9_EFI]\r
 BaseAddress   = 0x08000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.\r
-Size          = 0x00280000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
+Size          = 0x00300000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 \r
 # This one is tricky, it must be: BlockSize * NumBlocks = Size\r
 BlockSize     = 0x00001000\r
-NumBlocks     = 0x280\r
+NumBlocks     = 0x300\r
 \r
 ################################################################################\r
 #\r