sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmPkg/BdsLib: Added support for FDT alignment through PcdArmLinuxFdtAlignment

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



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14274 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin
2013-04-14 09:36:41 +00:00
parent ac0fb62f03
commit 387653a431
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ArmPkg/Library/BdsLib/BdsLinuxFdt.c
View File

@@ -214,7 +214,9 @@ PrepareFdt (
{
EFI_STATUS Status;
EFI_PHYSICAL_ADDRESS NewFdtBlobBase;
EFI_PHYSICAL_ADDRESS NewFdtBlobAllocation;
UINTN NewFdtBlobSize;
UINT32 FdtAlignment;
VOID* fdt;
INTN err;
INTN node;
@@ -295,9 +297,15 @@ PrepareFdt (
//
NewFdtBlobSize = OriginalFdtSize + FDT_ADDITIONAL_ENTRIES_SIZE;
// If FDT load address needs to be aligned, allocate more space.
FdtAlignment = PcdGet32 (PcdArmLinuxFdtAlignment);
if (FdtAlignment != 0) {
NewFdtBlobSize += FdtAlignment;
}
// Try below a watermark address
Status = EFI_NOT_FOUND;
if (PcdGet32(PcdArmLinuxFdtMaxOffset) != 0) {
if (PcdGet32 (PcdArmLinuxFdtMaxOffset) != 0) {
NewFdtBlobBase = LINUX_FDT_MAX_OFFSET;
Status = gBS->AllocatePages (AllocateMaxAddress, EfiBootServicesData, EFI_SIZE_TO_PAGES(NewFdtBlobSize), &NewFdtBlobBase);
if (EFI_ERROR(Status)) {
@@ -316,6 +324,11 @@ PrepareFdt (
}
}
NewFdtBlobAllocation = NewFdtBlobBase;
if (FdtAlignment != 0) {
NewFdtBlobBase = ALIGN (NewFdtBlobBase, FdtAlignment);
}
// Load the Original FDT tree into the new region
fdt = (VOID*)(UINTN)NewFdtBlobBase;
err = fdt_open_into((VOID*)(UINTN)(*FdtBlobBase), fdt, NewFdtBlobSize);
@@ -530,7 +543,7 @@ PrepareFdt (
return EFI_SUCCESS;
FAIL_NEW_FDT:
gBS->FreePages (NewFdtBlobBase, EFI_SIZE_TO_PAGES (NewFdtBlobSize));
gBS->FreePages (NewFdtBlobAllocation, EFI_SIZE_TO_PAGES (NewFdtBlobSize));
FAIL_ALLOCATE_NEW_FDT:
*FdtBlobSize = (UINTN)fdt_totalsize ((VOID*)(UINTN)(*FdtBlobBase));