Revision: 14621
http://sourceforge.net/p/edk2/code/14621
Author: oliviermartin
Date: 2013-09-03 10:14:02 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
ArmPkg/CpuPei: Remove unused functions from the driver
The ConfigureMmu() function is unused - the only call to it
is commented out, and the functionality has been moved to
InitMmu() in MemoryInitPeiLib.c.
This change also removes the unused definitions from the file.
Change-Id: Ice795bfee25c403142d0c078533f8a46d04f82e9
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Roy Franz <[email protected]>
Signed-off-by:: Olivier Martin <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPkg/Drivers/CpuPei/CpuPei.c
Modified: trunk/edk2/ArmPkg/Drivers/CpuPei/CpuPei.c
===================================================================
--- trunk/edk2/ArmPkg/Drivers/CpuPei/CpuPei.c 2013-09-03 08:52:49 UTC (rev
14620)
+++ trunk/edk2/ArmPkg/Drivers/CpuPei/CpuPei.c 2013-09-03 10:14:02 UTC (rev
14621)
@@ -43,114 +43,10 @@
#include <Library/HobLib.h>
#include <Library/ArmLib.h>
-//
-// Module globals
-//
-
-#define DDR_ATTRIBUTES_CACHED
ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK
-#define DDR_ATTRIBUTES_UNCACHED
ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED
-
-EFI_STATUS
-FindMainMemory (
- OUT UINT32 *PhysicalBase,
- OUT UINT32 *Length
- )
-{
- EFI_PEI_HOB_POINTERS NextHob;
-
- // Look at the resource descriptor hobs, choose the first system memory one
- NextHob.Raw = GetHobList ();
- while ((NextHob.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR,
NextHob.Raw)) != NULL) {
- if(NextHob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY)
- {
- *PhysicalBase = (UINT32)NextHob.ResourceDescriptor->PhysicalStart;
- *Length = (UINT32)NextHob.ResourceDescriptor->ResourceLength;
- return EFI_SUCCESS;
- }
-
- NextHob.Raw = GET_NEXT_HOB (NextHob);
- }
-
- return EFI_NOT_FOUND;
-}
-
-VOID
-ConfigureMmu (
- VOID
- )
-{
- EFI_STATUS Status;
- UINTN Idx;
- UINT32 CacheAttributes;
- UINT32 SystemMemoryBase;
- UINT32 SystemMemoryLength;
- UINT32 SystemMemoryLastAddress;
- ARM_MEMORY_REGION_DESCRIPTOR MemoryTable[4];
- VOID *TranslationTableBase;
- UINTN TranslationTableSize;
-
- if (FeaturePcdGet(PcdCacheEnable) == TRUE) {
- CacheAttributes = DDR_ATTRIBUTES_CACHED;
- } else {
- CacheAttributes = DDR_ATTRIBUTES_UNCACHED;
- }
-
- Idx = 0;
-
- // Main Memory
- Status = FindMainMemory (&SystemMemoryBase, &SystemMemoryLength);
- ASSERT_EFI_ERROR (Status);
-
- SystemMemoryLastAddress = SystemMemoryBase + (SystemMemoryLength-1);
-
- // If system memory does not begin at 0
- if(SystemMemoryBase > 0) {
- MemoryTable[Idx].PhysicalBase = 0;
- MemoryTable[Idx].VirtualBase = 0;
- MemoryTable[Idx].Length = SystemMemoryBase;
- MemoryTable[Idx].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
- Idx++;
- }
-
- MemoryTable[Idx].PhysicalBase = SystemMemoryBase;
- MemoryTable[Idx].VirtualBase = SystemMemoryBase;
- MemoryTable[Idx].Length = SystemMemoryLength;
- MemoryTable[Idx].Attributes =
(ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;
- Idx++;
-
- // If system memory does not go to the last address (0xFFFFFFFF)
- if( SystemMemoryLastAddress < MAX_ADDRESS ) {
- MemoryTable[Idx].PhysicalBase = SystemMemoryLastAddress + 1;
- MemoryTable[Idx].VirtualBase = MemoryTable[Idx].PhysicalBase;
- MemoryTable[Idx].Length = MAX_ADDRESS -
MemoryTable[Idx].PhysicalBase + 1;
- MemoryTable[Idx].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
- Idx++;
- }
-
- // End of Table
- MemoryTable[Idx].PhysicalBase = 0;
- MemoryTable[Idx].VirtualBase = 0;
- MemoryTable[Idx].Length = 0;
- MemoryTable[Idx].Attributes = (ARM_MEMORY_REGION_ATTRIBUTES)0;
-
- DEBUG ((EFI_D_INFO, "Enabling MMU, setting 0x%08x + %d MB to %a\n",
- SystemMemoryBase, SystemMemoryLength/1024/1024,
- (CacheAttributes == DDR_ATTRIBUTES_CACHED) ? "cacheable" : "uncacheable"));
-
- Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase,
&TranslationTableSize);
- if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Error: Failed to enable MMU (error code: %r)\n",
Status));
- }
-
- BuildMemoryAllocationHob((EFI_PHYSICAL_ADDRESS)(UINTN)TranslationTableBase,
TranslationTableSize, EfiBootServicesData);
-}
-
/*++
Routine Description:
-
-
Arguments:
FileHandle - Handle of the file being invoked.
@@ -179,8 +75,6 @@
// Publish the CPU memory and io spaces sizes
BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize));
- //ConfigureMmu();
-
// Only MP Core platform need to produce gArmMpCoreInfoPpiGuid
Status = PeiServicesLocatePpi (&gArmMpCoreInfoPpiGuid, 0, NULL,
(VOID**)&ArmMpCoreInfoPpi);
if (!EFI_ERROR(Status)) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
