From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 22 Aug 2011 11:01:44 +0000 (+0000)
Subject: ArmPkg/BdsLib: InitrdImageSize was not initialized when no initrd was
X-Git-Tag: edk2-stable201903~14362
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=48be3ea2e0e0c7f4ce88f3466c952aa79d50a094

ArmPkg/BdsLib: InitrdImageSize was not initialized when no initrd was
passed

The PrepareAtagList function is using this variable to determine if a
initrd was passed to the kernel.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12181 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/ArmPkg/Library/BdsLib/BdsLinuxLoader.c b/ArmPkg/Library/BdsLib/BdsLinuxLoader.c
index 2b42b28ff4..ce4b2a43b6 100644
--- a/ArmPkg/Library/BdsLib/BdsLinuxLoader.c
+++ b/ArmPkg/Library/BdsLib/BdsLinuxLoader.c
@@ -218,11 +218,14 @@ BdsBootLinux (
   UINT32                KernelParamsSize;
   EFI_PHYSICAL_ADDRESS  KernelParamsAddress;
   UINT32                MachineType;
-  BOOLEAN               FdtSupported = FALSE;
+  BOOLEAN               FdtSupported;
   LINUX_KERNEL          LinuxKernel;
   EFI_PHYSICAL_ADDRESS  LinuxImage;
   EFI_PHYSICAL_ADDRESS  InitrdImage;
 
+  InitrdImageSize = 0;
+  FdtSupported = FALSE;
+	
   // Ensure the System Memory PCDs have been initialized (PcdSystemMemoryBase and PcdSystemMemorySize)
   ASSERT (PcdGet32(PcdSystemMemorySize) != 0);
 
@@ -238,7 +241,6 @@ BdsBootLinux (
   LinuxKernel = (LINUX_KERNEL)(UINTN)LinuxImage;
 
   if (InitrdDevicePath) {
-    InitrdImageSize = 0;
     Status = BdsLoadImage (InitrdDevicePath, AllocateAnyPages, &InitrdImage, &InitrdImageSize);
     if (EFI_ERROR(Status)) {
       Print (L"ERROR: Did not find initrd image.\n");