summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2013-04-14 09:34:48 +0000
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2013-04-14 09:34:48 +0000
commit467b76b5c6c371b9a0989a17ca00de48fdc0b38a (patch)
tree92ff25157a1747b4e38d765a54ec0a3d85bc7546
parent3809e6e071ff3cfee9553c5153d14603ccd8e8a5 (diff)
downloadedk2-platforms-467b76b5c6c371b9a0989a17ca00de48fdc0b38a.tar.xz
ArmPkg/BdsLib: Fix uInitrd detection
This patch corrects a problem detecting uInitrd signature when booting with FDT. BdsBootLinuxFdt was attempting to read the signature from InitrdImage which is zero at this point in the code. The code now reads the signature from InitrdImageBase. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org> Reviewed-by: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14272 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c b/ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c
index 0c4d9f6b08..0e8113cb31 100644
--- a/ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c
+++ b/ArmPkg/Library/BdsLib/Arm/BdsLinuxLoader.c
@@ -263,7 +263,7 @@ BdsBootLinuxFdt (
}
// Check if the initrd is a uInitrd
- if (*(UINT32*)((UINTN)InitrdImage) == LINUX_UIMAGE_SIGNATURE) {
+ if (*(UINT32*)((UINTN)InitrdImageBase) == LINUX_UIMAGE_SIGNATURE) {
// Skip the 64-byte image header
InitrdImage = (EFI_PHYSICAL_ADDRESS)((UINTN)InitrdImageBase + 64);
InitrdImageSize = InitrdImageBaseSize - 64;