diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-04-13 13:47:46 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-04-13 15:35:01 +0200 |
| commit | 8457f5e40277d682b2de25f7769106a2cf803216 (patch) | |
| tree | 449ee47821b1d0a10205e4709c5d425cabb3bfcb /ArmVirtPkg | |
| parent | 488182b6faf36676c507ecbd4fc596ccb015d442 (diff) | |
| download | edk2-platforms-8457f5e40277d682b2de25f7769106a2cf803216.tar.xz | |
ArmVirtPkg/RelocatableVirtHelper: use correct FindMemNode argument order
Commit 03b6bed17ea6 ArmVirtPkg/XenRelocatablePlatformLib: rewrite DTB
memory node retrieval in C") introduced a FindMemNode () C function
that takes pointers to system memory base and size as arguments, but the
calling code passes them in the wrong order.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'ArmVirtPkg')
4 files changed, 8 insertions, 8 deletions
diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S index 0980a38720..27ad07a1a1 100644 --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S @@ -82,8 +82,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack.
//
- adr x1, PcdGet64 (PcdSystemMemorySize)
- adr x2, PcdGet64 (PcdSystemMemoryBase)
+ adr x1, PcdGet64 (PcdSystemMemoryBase)
+ adr x2, PcdGet64 (PcdSystemMemorySize)
mov sp, x7
bl FindMemnode
cbz x0, .Lout
diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S index 3d77ea2157..097038806e 100644 --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S @@ -79,8 +79,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack.
//
- ldr r1, =PcdGet64 (PcdSystemMemorySize)
- ldr r2, =PcdGet64 (PcdSystemMemoryBase)
+ ldr r1, =PcdGet64 (PcdSystemMemoryBase)
+ ldr r2, =PcdGet64 (PcdSystemMemorySize)
mov sp, r5
bl FindMemnode
teq r0, #0
diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S index ae77492bf3..940bcb2d25 100644 --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S @@ -81,8 +81,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack.
//
- adr x1, PcdGet64 (PcdSystemMemorySize)
- adr x2, PcdGet64 (PcdSystemMemoryBase)
+ adr x1, PcdGet64 (PcdSystemMemoryBase)
+ adr x2, PcdGet64 (PcdSystemMemorySize)
mov sp, x7
bl FindMemnode
cbz x0, .Lout
diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S index b69c6d618a..539426f36f 100644 --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S @@ -78,8 +78,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack.
//
- ldr r1, =PcdGet64 (PcdSystemMemorySize)
- ldr r2, =PcdGet64 (PcdSystemMemoryBase)
+ ldr r1, =PcdGet64 (PcdSystemMemoryBase)
+ ldr r2, =PcdGet64 (PcdSystemMemorySize)
mov sp, r5
bl FindMemnode
teq r0, #0
|