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@7707 6f19259b-4bc3-4df7-8a09-765794883524

IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h

@@ -63,7 +63,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/CapsuleLib.h>
 #include <Library/HiiLib.h>
 #include <Library/ExtendedHiiLib.h>
-
+#include <Library/PcdLib.h>
 
 #include <Library/GenericBdsLib.h>
 #include <Library/PlatformBdsLib.h>

IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

@@ -111,7 +111,8 @@
   UefiDriverEntryPoint
   PlatformBdsLib
   CapsuleLib
-
+  PcdLib
+  
 [Guids]
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)
                                                 ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)
@@ -170,7 +171,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
-
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+  
 [Depex]
   TRUE
 

IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c

@@ -610,16 +610,7 @@ ApplyChangeHandler (
     break;
 
   case FORM_TIME_OUT_ID:
-    Status = gRT->SetVariable (
-                    L"Timeout",
-                    &gEfiGlobalVariableGuid,
-                    VAR_FLAG,
-                    sizeof (UINT16),
-                    &(CurrentFakeNVMap->BootTimeOut)
-                    );
-    if (EFI_ERROR (Status)) {
-      goto Error;
-    }
+    PcdSet16 (PcdPlatformBootTimeOut, CurrentFakeNVMap->BootTimeOut);
 
     Private->BmmOldFakeNVData.BootTimeOut = CurrentFakeNVMap->BootTimeOut;
     break;

IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c

@@ -651,7 +651,7 @@ UpdateTimeOutPage (
 
   UpdatePageStart (CallbackData);
 
-  BootTimeOut = BdsLibGetTimeout ();
+  BootTimeOut = PcdGet16 (PcdPlatformBootTimeOut);
 
   CreateNumericOpCode (
     (EFI_QUESTION_ID) BOOT_TIME_OUT_QUESTION_ID,