Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

EmbeddedPkg/AndroidFastboot: Use Linux Loader instead of BdsLib 

Android FastBoot EFI application was using the Linux Loader
from BdsLib. This change makes use of the EFI Linux Loader
application.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <Olivier.Martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17967 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin 2015-07-14 14:31:05 +00:00 committed by oliviermartin
parent 0c72676d37
commit bd9a5182a5
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
View File

@ -1,6 +1,6 @@
#/** @file #/** @file
# #
# Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR> # Copyright (c) 2013-2015, ARM Ltd. All rights reserved.<BR>
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -39,6 +39,7 @@
PrintLib PrintLib
UefiApplicationEntryPoint UefiApplicationEntryPoint
UefiBootServicesTableLib UefiBootServicesTableLib
UefiLib
UefiRuntimeServicesTableLib UefiRuntimeServicesTableLib
[Protocols] [Protocols]

48
EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
View File

@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR> Copyright (c) 2013-2015, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -18,9 +18,16 @@
#include <Library/BdsLib.h> #include <Library/BdsLib.h>
#include <Library/DevicePathLib.h> #include <Library/DevicePathLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
#include <Guid/ArmGlobalVariableHob.h> #include <Guid/ArmGlobalVariableHob.h>
#define LINUX_LOADER_COMMAND_LINE L"%s -f %s -c %s"
// This GUID is defined in the INGF file of ArmPkg/Application/LinuxLoader
CONST EFI_GUID mLinuxLoaderAppGuid = { 0x701f54f2, 0x0d70, 0x4b89, { 0xbc, 0x0a, 0xd9, 0xca, 0x25, 0x37, 0x90, 0x59 }};
// Device Path representing an image in memory // Device Path representing an image in memory
#pragma pack(1) #pragma pack(1)
typedef struct { typedef struct {
@ -64,6 +71,10 @@ BootAndroidBootImg (
UINTN RamdiskSize; UINTN RamdiskSize;
MEMORY_DEVICE_PATH KernelDevicePath; MEMORY_DEVICE_PATH KernelDevicePath;
MEMORY_DEVICE_PATH* RamdiskDevicePath; MEMORY_DEVICE_PATH* RamdiskDevicePath;
CHAR16* KernelDevicePathTxt;
CHAR16* RamdiskDevicePathTxt;
EFI_DEVICE_PATH* LinuxLoaderDevicePath;
CHAR16* LoadOptions;
Status = ParseAndroidBootImg ( Status = ParseAndroidBootImg (
Buffer, Buffer,
@ -92,20 +103,45 @@ BootAndroidBootImg (
RamdiskDevicePath->Node1.EndingAddress = ((EFI_PHYSICAL_ADDRESS)(UINTN) Ramdisk) + RamdiskSize; RamdiskDevicePath->Node1.EndingAddress = ((EFI_PHYSICAL_ADDRESS)(UINTN) Ramdisk) + RamdiskSize;
} }
Status = BdsBootLinuxFdt ( //
(EFI_DEVICE_PATH_PROTOCOL *) &KernelDevicePath, // Boot Linux using the Legacy Linux Loader
(EFI_DEVICE_PATH_PROTOCOL *) RamdiskDevicePath, //
KernelArgs
); Status = LocateEfiApplicationInFvByGuid (&mLinuxLoaderAppGuid, &LinuxLoaderDevicePath);
if (EFI_ERROR (Status)) {
Print (L"Couldn't Boot Linux: %d\n", Status);
return EFI_DEVICE_ERROR;
}
KernelDevicePathTxt = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL *) &KernelDevicePath, FALSE, FALSE);
if (KernelDevicePathTxt == NULL) {
return EFI_OUT_OF_RESOURCES;
}
RamdiskDevicePathTxt = ConvertDevicePathToText ((EFI_DEVICE_PATH_PROTOCOL *) RamdiskDevicePath, FALSE, FALSE);
if (RamdiskDevicePathTxt == NULL) {
return EFI_OUT_OF_RESOURCES;
}
// Initialize Legacy Linux loader command line
LoadOptions = CatSPrint (NULL, LINUX_LOADER_COMMAND_LINE, KernelDevicePathTxt, RamdiskDevicePathTxt, KernelArgs);
if (LoadOptions == NULL) {
return EFI_OUT_OF_RESOURCES;
}
Status = BdsStartEfiApplication (gImageHandle, LinuxLoaderDevicePath, StrSize (LoadOptions), LoadOptions);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Couldn't Boot Linux: %d\n", Status)); DEBUG ((EFI_D_ERROR, "Couldn't Boot Linux: %d\n", Status));
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
} }
if (RamdiskDevicePath) { if (RamdiskDevicePath) {
FreePool (RamdiskDevicePathTxt);
FreePool (RamdiskDevicePath); FreePool (RamdiskDevicePath);
} }
FreePool (KernelDevicePathTxt);
// If we got here we do a confused face because BootLinuxFdt returned, // If we got here we do a confused face because BootLinuxFdt returned,
// reporting success. // reporting success.
DEBUG ((EFI_D_ERROR, "WARNING: BdsBootLinuxFdt returned EFI_SUCCESS.\n")); DEBUG ((EFI_D_ERROR, "WARNING: BdsBootLinuxFdt returned EFI_SUCCESS.\n"));