diff options
| author | Steven Kinney <steven.kinney@linaro.org> | 2013-11-22 08:15:09 -0600 |
|---|---|---|
| committer | Steven Kinney <steven.kinney@linaro.org> | 2013-11-22 08:15:09 -0600 |
| commit | aec0833cc55918a9111af736171ba8ceb976824e (patch) | |
| tree | 3b188d6e0c1075a5df74f724bb302486454e25e8 /ArmPlatformPkg/Bds/BootOption.c | |
| parent | e08b4a7ea684e3358f0281da5e23ae03b1b14116 (diff) | |
| parent | 0caeca1501ec2edee346a3108f45e556e7905204 (diff) | |
Merging uefi-next/linaro-release into masterlinaro-uefi-2013.11
Signed-off-by: Steven Kinney <steven.kinney@linaro.org>
Diffstat (limited to 'ArmPlatformPkg/Bds/BootOption.c')
| -rw-r--r-- | ArmPlatformPkg/Bds/BootOption.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ArmPlatformPkg/Bds/BootOption.c b/ArmPlatformPkg/Bds/BootOption.c index 7bbd548c8..edd193e3e 100644 --- a/ArmPlatformPkg/Bds/BootOption.c +++ b/ArmPlatformPkg/Bds/BootOption.c @@ -73,7 +73,7 @@ BootOptionStart ( if (LoaderType == BDS_LOADER_KERNEL_LINUX_LOCAL_FDT) { FdtLocalSize = ReadUnaligned16 ((CONST UINT16*)&LinuxArguments->FdtLocalSize); -
+ if (FdtLocalSize > 0) { FdtDevicePath = GetAlignedDevicePath ((EFI_DEVICE_PATH*)((UINTN)(LinuxArguments + 1) + CmdLineSize + InitrdSize)); } else { |