From 78b719ae2ed967ee3945d786c2093b8c69df5fea Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 27 Feb 2009 01:49:34 +0000
Subject: [PATCH] 1, Change name of PcdPlatformBootTimeoutDefault to
 PcdPlatformBootTimeout, now this PCD is *not* only hold default value of Bds
 timeout, but it is associated with a HII type PCD to hold persistent value
 for BDS timeout. Platform integrator will establish this mapping in platform
 DSC file. 2, Move PcdPlatformBootTimeout to IntelFrameworkModulePkg. 3,
 Remove BdsLibGetTimeout() interface from GenericBdsLib, because the PCD
 PcdPlatformBootTimeout will take care of persistent for time out value.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7724 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../FrameworkHiiOnUefiHiiThunk.inf            |  5 +++--
 .../FrameworkHiiOnUefiHiiThunk/SetupBrowser.c | 22 +------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
index dd3c0c754d..4a7ae4d0f8 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
@@ -65,7 +65,8 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
-
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+  
 [LibraryClasses]
   UefiRuntimeServicesTableLib
   UefiBootServicesTableLib
@@ -95,7 +96,7 @@
   gEfiFormBrowserCompatibilityProtocolGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
 
 [Depex]
   gEfiHiiDatabaseProtocolGuid AND
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
index 7f42842755..7c4b27f077 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
@@ -385,27 +385,7 @@ GetTimeout (
   VOID
   )
 {
-  UINT16      Timeout;
-  UINTN       Size;
-  EFI_STATUS  Status;
-
-  //
-  // Return Timeout variable or 0xffff if no valid
-  // Timeout variable exists.
-  //
-  Size    = sizeof (UINT16);
-  Status  = gRT->GetVariable (L"Timeout", &gEfiGlobalVariableGuid, NULL, &Size, &Timeout);
-  if (EFI_ERROR (Status)) {
-    //
-    // According to UEFI 2.0 spec, it should treat the Timeout value as 0xffff
-    // (default value PcdPlatformBootTimeOutDefault) when L"Timeout" variable is not present.
-    // To make the current EFI Automatic-Test activity possible, platform can choose other value
-    // for automatic boot when the variable is not present.
-    //
-    Timeout = PcdGet16 (PcdPlatformBootTimeOutDefault);
-  }
-
-  return Timeout;
+  return PcdGet16 (PcdPlatformBootTimeOut);
 }
 
 
-- 
2.39.2