diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2015-07-28 12:53:36 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2015-07-28 18:56:04 +0100 |
| commit | ea31f8eb0ca0500212fc577c17b4a48e6d2656af (patch) | |
| tree | 636987dfacd3b9ec9ad85b3a375b5c492fc6038b /ArmPkg/Library/BdsLib/BdsLinuxFdt.c | |
| parent | a2327c2ea41832c450184111712132ddb8307e04 (diff) | |
ArmPkg: BdsLib: replace fixed pcds with constantsarmlt-20151026-001armlt-20150825armlt-15.10armlt-15.09armlt-15.0820150803-00115.1015.0915.08
BdsLib was using fixed PCDs where constants could easily perform that
same function.
This patch is based off an older Tiancore. A version based of the tip
of tree was posted to linaro-uefi for review:
https://lists.linaro.org/pipermail/linaro-uefi/2015-July/001019.html
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Diffstat (limited to 'ArmPkg/Library/BdsLib/BdsLinuxFdt.c')
| -rw-r--r-- | ArmPkg/Library/BdsLib/BdsLinuxFdt.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c index e3795527f2..3baf162d47 100644 --- a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c +++ b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c @@ -231,20 +231,16 @@ RelocateFdt ( {
EFI_STATUS Status;
INTN Error;
- UINT64 FdtAlignment;
*RelocatedFdtSize = OriginalFdtSize + FDT_ADDITIONAL_ENTRIES_SIZE;
// If FDT load address needs to be aligned, allocate more space.
- FdtAlignment = PcdGet32 (PcdArmLinuxFdtAlignment);
- if (FdtAlignment != 0) {
- *RelocatedFdtSize += FdtAlignment;
- }
+ *RelocatedFdtSize += LINUX_FDT_ALIGNMENT;
// Try below a watermark address.
Status = EFI_NOT_FOUND;
- if (PcdGet32 (PcdArmLinuxFdtMaxOffset) != 0) {
- *RelocatedFdt = LINUX_FDT_MAX_OFFSET;
+ if (LINUX_FDT_MAX_OFFSET != 0) {
+ *RelocatedFdt = LINUX_FDT_MAX_ADDR;
Status = gBS->AllocatePages (AllocateMaxAddress, EfiBootServicesData,
EFI_SIZE_TO_PAGES (*RelocatedFdtSize), RelocatedFdt);
if (EFI_ERROR (Status)) {
@@ -265,8 +261,8 @@ RelocateFdt ( }
*RelocatedFdtAlloc = *RelocatedFdt;
- if (FdtAlignment != 0) {
- *RelocatedFdt = ALIGN (*RelocatedFdt, FdtAlignment);
+ if (LINUX_FDT_ALIGNMENT != 0) {
+ *RelocatedFdt = ALIGN (*RelocatedFdt, LINUX_FDT_ALIGNMENT);
}
// Load the Original FDT tree into the new region
|