ArmPlatformPkg: Introduce ArmPlatformInitialize() function

[mirror_edk2.git] / ArmPlatformPkg / ArmRealViewEbPkg / Library / ArmRealViewEbLibRTSM / ArmRealViewEbMem.c

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
index 759de3a2dd7f288a1a64a742b4138fb2a23f524e..01720bb23eacf6a6f49c5a8b029aab9bf3e1eb85 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -16,6 +16,7 @@
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
+#include <Library/IoLib.h>\r
 \r
 // DDR attributes\r
 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK\r
@@ -54,7 +55,6 @@ VOID ArmPlatformGetPeiMemory (
 \r
 **/\r
 VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap) {\r
-    UINT32                        val32;\r
     UINT32                        CacheAttributes;\r
     BOOLEAN                       bTrustzoneSupport = FALSE;\r
     UINTN                         Index = 0;\r
@@ -179,14 +179,14 @@ VOID ArmPlatformGetEfiMemoryMap (
         // Chunk between the EFI Memory region and the firmware\r
         EfiMemoryTable[++Index].ResourceAttribute = Attributes;\r
         EfiMemoryTable[Index].PhysicalStart = MemoryBase;\r
-        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdEmbeddedFdBaseAddress) - MemoryBase;\r
+        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdNormalFdBaseAddress) - MemoryBase;\r
 \r
         // Chunk reserved by the firmware in DRAM\r
         EfiMemoryTable[++Index].ResourceAttribute = Attributes & (~EFI_RESOURCE_ATTRIBUTE_PRESENT);\r
-        EfiMemoryTable[Index].PhysicalStart = PcdGet32(PcdEmbeddedFdBaseAddress);\r
-        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdEmbeddedFdSize);\r
+        EfiMemoryTable[Index].PhysicalStart = PcdGet32(PcdNormalFdBaseAddress);\r
+        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdNormalFdSize);\r
 \r
-        MemoryBase = PcdGet32(PcdEmbeddedFdBaseAddress) + PcdGet32(PcdEmbeddedFdSize);\r
+        MemoryBase = PcdGet32(PcdNormalFdBaseAddress) + PcdGet32(PcdNormalFdSize);\r
     }\r
       \r
     // We allocate all the remain memory as untested system memory\r