3 files changed, 5 insertions, 9 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index f89d8b8ebe..f5431551f5 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -5,7 +5,7 @@
   After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will be invoked
   to enter BDS phase.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -38,8 +38,6 @@ EFI_BDS_ARCH_PROTOCOL  gBds = {
 
 UINT16                          *mBootNext = NULL;
 
-EFI_HANDLE                      mBdsImageHandle;
-
 /**
 
   Install Boot Device Selection Protocol
@@ -61,8 +59,6 @@ BdsInitialize (
 {
   EFI_STATUS  Status;
 
-  mBdsImageHandle = ImageHandle;
-
   //
   // Install protocol interface
   //
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
index 09f48b874b..ef2e2d860e 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
@@ -1,7 +1,7 @@
 /** @file
   Language settings
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -263,7 +263,7 @@ ExportFonts (
 
   HiiHandle = HiiAddPackages (
                 &mFontPackageGuid,
-                mBdsImageHandle,
+                gImageHandle,
                 &mFontBin,
                 NULL
                 );
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
index 9924352234..d02001b4d1 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
@@ -1,7 +1,7 @@
 /** @file
   String support
 
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -33,7 +33,7 @@ InitializeStringSupport (
 {
   gStringPackHandle = HiiAddPackages (
                          &mBdsStringPackGuid,
-                         mBdsImageHandle,
+                         gImageHandle,
                          BdsDxeStrings,
                          NULL
                          );