ArmPlatformPkg/ArmPlatformLib: Move the UEFI memory partionning to MemoryInitPei

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Library / ArmVExpressLibCTA9x4 / CTA9x4Mem.c

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
index 8d1bf1f83706a25c77a5deac80fb7520984aaba5..cd72f4af3c6d67043dbaae8f5aca4ea598bd7ae9 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
@@ -24,26 +24,6 @@
 #define DDR_ATTRIBUTES_SECURE_CACHED    ARM_MEMORY_REGION_ATTRIBUTE_SECURE_WRITE_BACK\r
 #define DDR_ATTRIBUTES_SECURE_UNCACHED  ARM_MEMORY_REGION_ATTRIBUTE_SECURE_UNCACHED_UNBUFFERED\r
 \r
-/**\r
-  Return the information about the memory region in permanent memory used by PEI\r
-\r
-  One of the PEI Module must install the permament memory used by PEI. This function returns the\r
-  information about this region for your platform to this PEIM module.\r
-\r
-  @param[out]   PeiMemoryBase       Base of the memory region used by PEI core and modules\r
-  @param[out]   PeiMemorySize       Size of the memory region used by PEI core and modules\r
-\r
-**/\r
-VOID ArmPlatformGetPeiMemory (\r
-    OUT UINTN*                                   PeiMemoryBase,\r
-    OUT UINTN*                                   PeiMemorySize\r
-    ) {\r
-    ASSERT((PeiMemoryBase != NULL) && (PeiMemorySize != NULL));\r
-    \r
-    *PeiMemoryBase = ARM_VE_DRAM_BASE + ARM_VE_EFI_FIX_ADDRESS_REGION_SZ;\r
-    *PeiMemorySize = ARM_VE_EFI_MEMORY_REGION_SZ;\r
-}\r
-\r
 /**\r
   Return the Virtual Memory Map of your platform\r
 \r
@@ -146,67 +126,10 @@ VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemory
                                     EFI Memory region. This array must be ended by a zero-filled entry\r
 \r
 **/\r
-VOID ArmPlatformGetEfiMemoryMap (\r
-    OUT ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR** EfiMemoryMap\r
-) {\r
-    EFI_RESOURCE_ATTRIBUTE_TYPE     Attributes;\r
-    UINT64                          MemoryBase;\r
-    UINTN                           Index = 0;\r
-    ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR  *EfiMemoryTable;\r
-\r
-    ASSERT(EfiMemoryMap != NULL);\r
-\r
-    EfiMemoryTable = (ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR*)AllocatePages(sizeof(ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR) * 6);\r
-\r
-    Attributes =\r
-    (\r
-      EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
-      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
-      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
-      EFI_RESOURCE_ATTRIBUTE_TESTED\r
-    );\r
-    MemoryBase = ARM_VE_DRAM_BASE;\r
-  \r
-    // Memory Reserved for fixed address allocations (such as Exception Vector Table)\r
-    EfiMemoryTable[Index].ResourceAttribute = Attributes;\r
-    EfiMemoryTable[Index].PhysicalStart = MemoryBase;\r
-    EfiMemoryTable[Index].NumberOfBytes = ARM_VE_EFI_FIX_ADDRESS_REGION_SZ;\r
-    \r
-    MemoryBase += ARM_VE_EFI_FIX_ADDRESS_REGION_SZ;\r
-\r
-    // Memory declared to PEI as permanent memory for PEI and DXE\r
-    EfiMemoryTable[++Index].ResourceAttribute = Attributes;\r
-    EfiMemoryTable[Index].PhysicalStart = MemoryBase;\r
-    EfiMemoryTable[Index].NumberOfBytes = ARM_VE_EFI_MEMORY_REGION_SZ;\r
-\r
-    MemoryBase += ARM_VE_EFI_MEMORY_REGION_SZ;\r
-\r
-    // We must reserve the memory used by the Firmware Volume copied in DRAM at 0x80000000\r
-    if (FeaturePcdGet(PcdStandalone) == FALSE) {\r
-        // Chunk between the EFI Memory region and the firmware\r
-        EfiMemoryTable[++Index].ResourceAttribute = Attributes;\r
-        EfiMemoryTable[Index].PhysicalStart = 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(PcdNormalFdBaseAddress);\r
-        EfiMemoryTable[Index].NumberOfBytes = PcdGet32(PcdNormalFdSize);\r
-\r
-        MemoryBase = PcdGet32(PcdNormalFdBaseAddress) + PcdGet32(PcdNormalFdSize);\r
-    }\r
-      \r
-    // We allocate all the remain memory as untested system memory\r
-    EfiMemoryTable[++Index].ResourceAttribute = Attributes & (~EFI_RESOURCE_ATTRIBUTE_TESTED);\r
-    EfiMemoryTable[Index].PhysicalStart = MemoryBase;\r
-    EfiMemoryTable[Index].NumberOfBytes = ARM_VE_DRAM_SZ - (MemoryBase-ARM_VE_DRAM_BASE);\r
-\r
-    EfiMemoryTable[++Index].ResourceAttribute = 0;\r
-    EfiMemoryTable[Index].PhysicalStart = 0;\r
-    EfiMemoryTable[Index].NumberOfBytes = 0;\r
-\r
-    *EfiMemoryMap = EfiMemoryTable;\r
+EFI_STATUS\r
+ArmPlatformGetAdditionalSystemMemory (\r
+  OUT ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR** EfiMemoryMap\r
+  )\r
+{\r
+  return EFI_UNSUPPORTED;\r
 }\r