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

diff --git a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
index dedffab2a7433c4fb1173489f48876d990bd30d6..537856f396a4f5931d7a7c6d8871af72f897d744 100644 (file)
--- a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
@@ -142,11 +142,6 @@ BdsLibGetTimeout (
   VOID\r
   );\r
 \r
-EFI_STATUS\r
-BdsLibGetBootMode (\r
-  OUT EFI_BOOT_MODE       *BootMode\r
-  );\r
-\r
 VOID\r
 BdsLibLoadDrivers (\r
   IN  LIST_ENTRY          *BdsDriverLists\r

diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c
index 2662ba72970548a04f84f7617b45b30560155f37..f1591846d8c1746599e2bf9dad4fd329d0d4a92e 100644 (file)
--- a/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkModulePkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -148,7 +148,7 @@ Returns:
                     );\r
 \r
     if (!EFI_ERROR (Status)) {\r
-      gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid,
+      gBS->HandleProtocol (ImageHandle, &gEfiLoadedImageProtocolGuid,\r
                           (VOID **)&ImageInfo);\r
 \r
       //\r
@@ -559,37 +559,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-EFI_STATUS\r
-BdsLibGetBootMode (\r
-  OUT EFI_BOOT_MODE       *BootMode\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Get boot mode by looking up configuration table and parsing HOB list\r
-\r
-Arguments:\r
-\r
-  BootMode - Boot mode from PEI handoff HOB.\r
-\r
-Returns:\r
-\r
-  EFI_SUCCESS - Successfully get boot mode\r
-  \r
-  EFI_NOT_FOUND - Can not find the current system boot mode\r
-\r
---*/\r
-{\r
-  EFI_HOB_HANDOFF_INFO_TABLE        *HobList;\r
-\r
-  HobList = GetHobList ();\r
-  ASSERT (HobList->Header.HobType == EFI_HOB_TYPE_HANDOFF);\r
-  *BootMode = HobList->BootMode;\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
 VOID *\r
 BdsLibGetVariableAndSize (\r
   IN  CHAR16              *Name,\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
index d1edef3d7ed9cadfda0d91af70c12977e071c099..846ba8e8ed7d8c8766813216bb495eb6589312a4 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -315,7 +315,7 @@ Returns:
   //\r
   // Get current Boot Mode\r
   //\r
-  Status = BdsLibGetBootMode (&PrivateData->BootMode);\r
+  PrivateData->BootMode = GetBootModeHob();\r
 \r
   //\r
   // Go the different platform policy with different boot mode\r

diff --git a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
index aa3cfaea7a1082fccfba2afdd5cc951a8e751468..5ef183850ee6206487e74d929cf0597bd51b1d89 100644 (file)
--- a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
@@ -142,11 +142,6 @@ BdsLibGetTimeout (
   VOID\r
   );\r
 \r
-EFI_STATUS\r
-BdsLibGetBootMode (\r
-  OUT EFI_BOOT_MODE       *BootMode\r
-  );\r
-\r
 VOID\r
 BdsLibLoadDrivers (\r
   IN  LIST_ENTRY          *BdsDriverLists\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index e7add072e18c30da4dfc828356c74df5b92bafc3..6a3ec058bf978ec6c4ec3b1f7daa5ba45cf5199f 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -558,37 +558,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-EFI_STATUS\r
-BdsLibGetBootMode (\r
-  OUT EFI_BOOT_MODE       *BootMode\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Get boot mode by looking up configuration table and parsing HOB list\r
-\r
-Arguments:\r
-\r
-  BootMode - Boot mode from PEI handoff HOB.\r
-\r
-Returns:\r
-\r
-  EFI_SUCCESS - Successfully get boot mode\r
-  \r
-  EFI_NOT_FOUND - Can not find the current system boot mode\r
-\r
---*/\r
-{\r
-  EFI_HOB_HANDOFF_INFO_TABLE        *HobList;\r
-\r
-  HobList = GetHobList ();\r
-  ASSERT (HobList->Header.HobType == EFI_HOB_TYPE_HANDOFF);\r
-  *BootMode = HobList->BootMode;\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
 VOID *\r
 BdsLibGetVariableAndSize (\r
   IN  CHAR16              *Name,\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index befb6677975f0171ee8de09a6ec41ccd6b9b9e10..6b4c74340d7623f48369d73a6ab14ce07f838d10 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -7615,7 +7615,7 @@
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>10</Value>\r
+          <Value>320</Value>\r
         </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
index d77d8488223a1fa836e36d91e15906884de024e3..f6e29c73e7d2cf0c3dca7e06bdbaac88a8cc774c 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -304,7 +304,7 @@ Returns:
   //\r
   // Get current Boot Mode\r
   //\r
-  Status = BdsLibGetBootMode (&PrivateData->BootMode);\r
+  PrivateData->BootMode = GetBootModeHob();\r
 \r
   //\r
   // Go the different platform policy with different boot mode\r