1, Change name of PcdPlatformBootTimeoutDefault to PcdPlatformBootTimeout, now this...

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
index dd3c0c754d7fa864c3c338bfd6a2fb4c77d229b6..4a7ae4d0f830001e5c0c2e234f863add4ca51e7f 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
@@ -65,7 +65,8 @@
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-\r
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  \r
 [LibraryClasses]\r
   UefiRuntimeServicesTableLib\r
   UefiBootServicesTableLib\r
@@ -95,7 +96,7 @@
   gEfiFormBrowserCompatibilityProtocolGuid\r
 \r
 [Pcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid AND\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
index 7f42842755abb6a8b31f2acb1a4439489356365c..7c4b27f077229df8f6a2ace5bc72e98df4010088 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
@@ -385,27 +385,7 @@ GetTimeout (
   VOID\r
   )\r
 {\r
-  UINT16      Timeout;\r
-  UINTN       Size;\r
-  EFI_STATUS  Status;\r
-\r
-  //\r
-  // Return Timeout variable or 0xffff if no valid\r
-  // Timeout variable exists.\r
-  //\r
-  Size    = sizeof (UINT16);\r
-  Status  = gRT->GetVariable (L"Timeout", &gEfiGlobalVariableGuid, NULL, &Size, &Timeout);\r
-  if (EFI_ERROR (Status)) {\r
-    //\r
-    // According to UEFI 2.0 spec, it should treat the Timeout value as 0xffff\r
-    // (default value PcdPlatformBootTimeOutDefault) when L"Timeout" variable is not present.\r
-    // To make the current EFI Automatic-Test activity possible, platform can choose other value\r
-    // for automatic boot when the variable is not present.\r
-    //\r
-    Timeout = PcdGet16 (PcdPlatformBootTimeOutDefault);\r
-  }\r
-\r
-  return Timeout;\r
+  return PcdGet16 (PcdPlatformBootTimeOut);\r
 }\r
 \r
 \r