roll back change
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4373 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@ -412,14 +412,11 @@ Returns:
|
|||||||
UINTN Instance;
|
UINTN Instance;
|
||||||
UINT8 *CopyBuffer;
|
UINT8 *CopyBuffer;
|
||||||
UINTN SectionSize;
|
UINTN SectionSize;
|
||||||
EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
|
|
||||||
UINT32 FvAlignment;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
OldTpl = CoreRaiseTpl (TPL_NOTIFY);
|
OldTpl = CoreRaiseTpl (TPL_NOTIFY);
|
||||||
Instance = SectionInstance + 1;
|
Instance = SectionInstance + 1;
|
||||||
FvHeader = NULL;
|
|
||||||
FvAlignment = 0;
|
|
||||||
//
|
//
|
||||||
// Locate target stream
|
// Locate target stream
|
||||||
//
|
//
|
||||||
@ -472,19 +469,8 @@ Returns:
|
|||||||
} else {
|
} else {
|
||||||
//
|
//
|
||||||
// Callee allocated buffer. Allocate buffer and return size.
|
// Callee allocated buffer. Allocate buffer and return size.
|
||||||
// For FvImage, the buffer is allocated at its required alignment.
|
|
||||||
//
|
//
|
||||||
if (*SectionType == EFI_SECTION_FIRMWARE_VOLUME_IMAGE) {
|
*Buffer = CoreAllocateBootServicesPool (CopySize);
|
||||||
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) CopyBuffer;
|
|
||||||
FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);
|
|
||||||
//
|
|
||||||
// FvAlignment must be more than 8 bytes required by FvHeader structure.
|
|
||||||
//
|
|
||||||
if (FvAlignment < 8) {
|
|
||||||
FvAlignment = 8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*Buffer = AllocateAlignedPool ((UINTN) CopySize, (UINTN) FvAlignment);
|
|
||||||
if (*Buffer == NULL) {
|
if (*Buffer == NULL) {
|
||||||
Status = EFI_OUT_OF_RESOURCES;
|
Status = EFI_OUT_OF_RESOURCES;
|
||||||
goto GetSection_Done;
|
goto GetSection_Done;
|
||||||
|
Reference in New Issue
Block a user