tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPkg/BdsLib: Exposed ShutdownUefiBootServices() in the BdsLib interface 

Other libraries/modules could use it (eg: EFI Shell command `runaxf`).

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17297 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin 2015-05-05 14:58:57 +00:00 committed by oliviermartin
parent b330087bab
commit cc053ee6da
6 changed files with 14 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArmPkg/Include/Library/BdsLib.h
View File

@ -1,6 +1,6 @@
/** @file
*
* Copyright (c) 2013, ARM Limited. All rights reserved.
* Copyright (c) 2013-2015, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
@ -221,4 +221,12 @@ BdsLoadImage (
OUT UINTN *FileSize
);
/**
* Call BS.ExitBootServices with the appropriate Memory Map information
*/
EFI_STATUS
ShutdownUefiBootServices (
VOID
);
#endif

5
ArmPkg/Library/BdsLib/BdsInternal.h
View File

@ -103,11 +103,6 @@ typedef struct {
} BDS_TFTP_CONTEXT;
// BdsHelper.c
EFI_STATUS
ShutdownUefiBootServices (
VOID
);
EFI_STATUS
GetSystemMemoryResources (
LIST_ENTRY *ResourceList

1
ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
View File

@ -44,6 +44,7 @@
ArmLib
ArmPlatformLib
BaseMemoryLib
DxeServicesTableLib
MemoryAllocationLib
UefiDriverEntryPoint
UefiBootServicesTableLib

1
ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
View File

@ -32,6 +32,7 @@
[LibraryClasses]
ArmShellCmdRunAxfLib
DxeServicesTableLib
MemoryAllocationLib
UefiDriverEntryPoint

1
ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
View File

@ -43,6 +43,7 @@
[LibraryClasses]
ArmLib
BaseLib
BdsLib
DebugLib
HiiLib
ShellLib

60
ArmPlatformPkg/Library/ArmShellCmdRunAxf/RunAxf.c
View File

@ -15,11 +15,13 @@
**/
#include <Guid/GlobalVariable.h>
#include <Library/PrintLib.h>
#include <Library/HandleParsingLib.h>
#include <Library/DevicePathLib.h>
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/BdsLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/DebugLib.h>
@ -34,64 +36,6 @@ typedef VOID (*ELF_ENTRYPOINT)(UINTN arg0, UINTN arg1,
UINTN arg2, UINTN arg3);
STATIC
EFI_STATUS
ShutdownUefiBootServices (
VOID
)
{
EFI_STATUS Status;
UINTN MemoryMapSize;
EFI_MEMORY_DESCRIPTOR *MemoryMap;
UINTN MapKey;
UINTN DescriptorSize;
UINT32 DescriptorVersion;
UINTN Pages;
MemoryMap = NULL;
MemoryMapSize = 0;
Pages = 0;
do {
Status = gBS->GetMemoryMap (
&MemoryMapSize,
MemoryMap,
&MapKey,
&DescriptorSize,
&DescriptorVersion
);
if (Status == EFI_BUFFER_TOO_SMALL) {
Pages = EFI_SIZE_TO_PAGES (MemoryMapSize) + 1;
MemoryMap = AllocatePages (Pages);
//
// Get System MemoryMap
//
Status = gBS->GetMemoryMap (
&MemoryMapSize,
MemoryMap,
&MapKey,
&DescriptorSize,
&DescriptorVersion
);
}
// Don't do anything between the GetMemoryMap() and ExitBootServices()
if (!EFI_ERROR (Status)) {
Status = gBS->ExitBootServices (gImageHandle, MapKey);
if (EFI_ERROR (Status)) {
FreePages (MemoryMap, Pages);
MemoryMap = NULL;
MemoryMapSize = 0;
}
}
} while (EFI_ERROR (Status));
return Status;
}
STATIC
EFI_STATUS
PreparePlatformHardware (