1) Replace BdsLibGetBootMode with GetBootMode from HobLib of MdePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2433 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 8 insertions, 80 deletions

diff --git a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
index dedffab2a7..537856f396 100644
--- a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
@@ -142,11 +142,6 @@ BdsLibGetTimeout (
   VOID

   );

 

-EFI_STATUS

-BdsLibGetBootMode (

-  OUT EFI_BOOT_MODE       *BootMode

-  );

-

 VOID

 BdsLibLoadDrivers (

   IN  LIST_ENTRY          *BdsDriverLists

diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c
index 2662ba7297..f1591846d8 100644
--- a/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -148,7 +148,7 @@ Returns:
                     );

 

     if (!EFI_ERROR (Status)) {

-      gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid,
+      gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid,

 			   (VOID **)&ImageInfo);

 

       //

@@ -559,37 +559,6 @@ Returns:
   return EFI_SUCCESS;

 }

 

-EFI_STATUS

-BdsLibGetBootMode (

-  OUT EFI_BOOT_MODE       *BootMode

-  )

-/*++

-

-Routine Description:

-

-  Get boot mode by looking up configuration table and parsing HOB list

-

-Arguments:

-

-  BootMode - Boot mode from PEI handoff HOB.

-

-Returns:

-

-  EFI_SUCCESS - Successfully get boot mode

-  

-  EFI_NOT_FOUND - Can not find the current system boot mode

-

---*/

-{

-  EFI_HOB_HANDOFF_INFO_TABLE        *HobList;

-

-  HobList = GetHobList ();

-  ASSERT (HobList->Header.HobType == EFI_HOB_TYPE_HANDOFF);

-  *BootMode = HobList->BootMode;

-

-  return EFI_SUCCESS;

-}

-

 VOID *

 BdsLibGetVariableAndSize (

   IN  CHAR16              *Name,

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
index d1edef3d7e..846ba8e8ed 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -315,7 +315,7 @@ Returns:
   //

   // Get current Boot Mode

   //

-  Status = BdsLibGetBootMode (&PrivateData->BootMode);

+  PrivateData->BootMode = GetBootModeHob();

 

   //

   // Go the different platform policy with different boot mode

diff --git a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
index aa3cfaea7a..5ef183850e 100644
--- a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
@@ -142,11 +142,6 @@ BdsLibGetTimeout (
   VOID

   );

 

-EFI_STATUS

-BdsLibGetBootMode (

-  OUT EFI_BOOT_MODE       *BootMode

-  );

-

 VOID

 BdsLibLoadDrivers (

   IN  LIST_ENTRY          *BdsDriverLists

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index e7add072e1..6a3ec058bf 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -558,37 +558,6 @@ Returns:
   return EFI_SUCCESS;

 }

 

-EFI_STATUS

-BdsLibGetBootMode (

-  OUT EFI_BOOT_MODE       *BootMode

-  )

-/*++

-

-Routine Description:

-

-  Get boot mode by looking up configuration table and parsing HOB list

-

-Arguments:

-

-  BootMode - Boot mode from PEI handoff HOB.

-

-Returns:

-

-  EFI_SUCCESS - Successfully get boot mode

-  

-  EFI_NOT_FOUND - Can not find the current system boot mode

-

---*/

-{

-  EFI_HOB_HANDOFF_INFO_TABLE        *HobList;

-

-  HobList = GetHobList ();

-  ASSERT (HobList->Header.HobType == EFI_HOB_TYPE_HANDOFF);

-  *BootMode = HobList->BootMode;

-

-  return EFI_SUCCESS;

-}

-

 VOID *

 BdsLibGetVariableAndSize (

   IN  CHAR16              *Name,

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index befb667797..6b4c74340d 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -7615,7 +7615,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

           <DatumType>UINT32</DatumType>

           <MaxDatumSize>4</MaxDatumSize>

-          <Value>10</Value>

+          <Value>320</Value>

         </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

diff --git a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
index d77d848822..f6e29c73e7 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -304,7 +304,7 @@ Returns:
   //

   // Get current Boot Mode

   //

-  Status = BdsLibGetBootMode (&PrivateData->BootMode);

+  PrivateData->BootMode = GetBootModeHob();

 

   //

   // Go the different platform policy with different boot mode