sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmPlatformPkg: Removed the global ImageHandle when UefiBootServicesTableLib is included

Browse Source 
UefiBootServicesTableLib already defines gImageHandle that has been initialized with
the value of ImageHandle.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15737 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin
2014-08-01 18:33:17 +00:00
committed by oliviermartin
parent d8162fb5aa
commit c3b6d97563
6 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArmPlatformPkg/Bds/Bds.c
View File

@@ -21,8 +21,6 @@
#define EFI_SET_TIMER_TO_SECOND 10000000
EFI_HANDLE mImageHandle;
STATIC
EFI_STATUS
GetConsoleDevicePathFromVariable (
@@ -542,8 +540,6 @@ BdsInitialize (
{
EFI_STATUS Status;
mImageHandle = ImageHandle;
Status = gBS->InstallMultipleProtocolInterfaces (
&ImageHandle,
&gEfiBdsArchProtocolGuid, &gBdsProtocol,

3
ArmPlatformPkg/Bds/BootMenu.c
View File

@@ -16,7 +16,6 @@
#include <Guid/ArmGlobalVariableHob.h>
extern EFI_HANDLE mImageHandle;
extern BDS_LOAD_OPTION_SUPPORT *BdsLoadOptionSupportList;
/**
@@ -954,7 +953,7 @@ BootShell (
EFI_STATUS Status;
// Start EFI Shell
Status = BdsLoadApplication (mImageHandle, L"Shell", 0, NULL);
Status = BdsLoadApplication (gImageHandle, L"Shell", 0, NULL);
if (Status == EFI_NOT_FOUND) {
Print (L"Error: EFI Application not found.\n");
} else if (EFI_ERROR(Status)) {

8
ArmPlatformPkg/Bds/BootOption.c
View File

@@ -1,6 +1,6 @@
/** @file
*
* Copyright (c) 2011-2013, ARM Limited. All rights reserved.
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
@@ -15,8 +15,6 @@
#include <Guid/ArmGlobalVariableHob.h>
#include "BdsInternal.h"
extern EFI_HANDLE mImageHandle;
EFI_STATUS
BootOptionStart (
IN BDS_LOAD_OPTION *BootOption
@@ -46,7 +44,7 @@ BootOptionStart (
BdsConnectAllDrivers ();
}
Status = BdsStartEfiApplication (mImageHandle, BootOption->FilePathList, 0, NULL);
Status = BdsStartEfiApplication (gImageHandle, BootOption->FilePathList, 0, NULL);
} else if (LoaderType == BDS_LOADER_KERNEL_LINUX_ATAG) {
LinuxArguments = &(OptionalData->Arguments.LinuxArguments);
CmdLineSize = ReadUnaligned16 ((CONST UINT16*)&LinuxArguments->CmdLineSize);
@@ -103,7 +101,7 @@ BootOptionStart (
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
LoadOptionIndexSize, &(BootOption->LoadOptionIndex));
Status = BdsStartEfiApplication (mImageHandle, BootOption->FilePathList, BootOption->OptionalDataSize, BootOption->OptionalData);
Status = BdsStartEfiApplication (gImageHandle, BootOption->FilePathList, BootOption->OptionalDataSize, BootOption->OptionalData);
// Clear BootCurrent variable
LoadOptionIndexSize = sizeof(UINT16);