From 76d17c315645552a99691ed0b2024f52b22aa8c9 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Thu, 22 Sep 2011 22:54:38 +0000 Subject: ArmPkg/BdsLib: Use two distinct functions to boot Linux either by Atag or Fdt Separate the BdsBootLinux() function into two functions for Atag and Fdt specific Linux booting - BdsBootLinuxAtag () - BdsBootLinuxFdt () git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12408 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/Bds/BootOption.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ArmPlatformPkg/Bds') diff --git a/ArmPlatformPkg/Bds/BootOption.c b/ArmPlatformPkg/Bds/BootOption.c index 86f2ac2dca..305892a8d6 100644 --- a/ArmPlatformPkg/Bds/BootOption.c +++ b/ArmPlatformPkg/Bds/BootOption.c @@ -54,10 +54,9 @@ BootOptionStart ( Initrd = NULL; } - Status = BdsBootLinux (BootOption->FilePathList, + Status = BdsBootLinuxAtag (BootOption->FilePathList, Initrd, // Initrd - (CHAR8*)(LinuxArguments + 1), // CmdLine - NULL); + (CHAR8*)(LinuxArguments + 1)); // CmdLine } else if (LoaderType == BDS_LOADER_KERNEL_LINUX_FDT) { LinuxArguments = &(OptionalData->Arguments.LinuxArguments); CmdLineSize = ReadUnaligned16 ((CONST UINT16*)&LinuxArguments->CmdLineSize); @@ -79,7 +78,7 @@ BootOptionStart ( Status = GetEnvironmentVariable ((CHAR16 *)L"FDT", DefaultFdtDevicePath, &FdtDevicePathSize, (VOID **)&FdtDevicePath); ASSERT_EFI_ERROR(Status); - Status = BdsBootLinux (BootOption->FilePathList, + Status = BdsBootLinuxFdt (BootOption->FilePathList, Initrd, // Initrd (CHAR8*)(LinuxArguments + 1), FdtDevicePath); -- cgit v1.2.3