ArmPlatformPkg/ArmPlatformLibNull: Fixed build

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

diff --git a/ArmPlatformPkg/ArmPlatformPkg.fdf b/ArmPlatformPkg/ArmPlatformPkg.fdf
index 887c1c10d1b10ca864c06484706f773a0349163b..41f6256eec15936f63a86396d9f3bdeb1680ead3 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          = 0x00012000|gArmTokenSpaceGuid.PcdSecureFdSize         #The size in bytes of the Secure FLASH Device\r
+Size          = 0x00015000|gArmTokenSpaceGuid.PcdSecureFdSize         #The size in bytes of the Secure FLASH Device\r
 ErasePolarity = 1\r
-BlockSize     = 0x00001200\r
+BlockSize     = 0x00001500\r
 NumBlocks     = 0x10\r
 \r
 ################################################################################\r
@@ -47,7 +47,7 @@ NumBlocks     = 0x10
 #\r
 ################################################################################\r
 \r
-0x00000000|0x00012000\r
+0x00000000|0x00015000\r
 gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize\r
 FV = FVMAIN_SEC\r
 \r

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
index 25ffbcf9c08c91e3890aaedebcb79b5cbc7d13d5..620562136ed6a20c8ed5b9ff02ec919d5fdc4c10 100644 (file)
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
@@ -11,6 +11,7 @@
 //\r
 //\r
 \r
+#include <AsmMacroIoLib.h>\r
 #include <Library/ArmLib.h>\r
 \r
   INCLUDE AsmMacroIoLib.inc\r