ArmPlatformPkg: Removed the global ImageHandle when UefiBootServicesTableLib is included

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

1 files changed, 3 insertions, 5 deletions

diff --git a/ArmPlatformPkg/Bds/BootOption.c b/ArmPlatformPkg/Bds/BootOption.c
index 52c9d831b7..aa8be74bc9 100644
--- a/ArmPlatformPkg/Bds/BootOption.c
+++ b/ArmPlatformPkg/Bds/BootOption.c
@@ -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);