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

diff --git a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
index a57fe6c8b4447288392378e838b306230e60ca79..7d1077d713d9094beb29297cb56a2b8510c1d148 100644 (file)
--- a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
+++ b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
@@ -196,18 +196,6 @@ BdsLibBuildOptionFromShell (
 //\r
 // Bds misc lib functions\r
 //\r
 //\r
 // Bds misc lib functions\r
 //\r

-/**\r
-  Return the default value for system Timeout variable.\r
-\r
-  @return Timeout value.\r
-\r
-**/\r
-UINT16\r
-EFIAPI\r
-BdsLibGetTimeout (\r
-  VOID\r
-  );\r
-\r

 /**\r
   Get boot mode by looking up configuration table and parsing HOB list\r
 \r
 /**\r
   Get boot mode by looking up configuration table and parsing HOB list\r
 \r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index c6a7094e4c45971debba79fee3fe2605c32fa146..3fe2e35d3a48778088caca8252bffe6d7a192dc5 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -106,5 +106,8 @@
 [PcdsPatchableInModule.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|UINT16|0x00010025\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128|UINT16|0x0001002e\r
 [PcdsPatchableInModule.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|UINT16|0x00010025\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128|UINT16|0x0001002e\r

-\r
-\r
+  \r
+[PcdsDynamic.common]\r
+  ## Timeout value for displaying progressing bar in before boot OS.\r
+  #  According to UEFI 2.0 spec, it should treat the Timeout value as 0xffff.\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0xffff|UINT16|0x40000001\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
index acf61ebcb6627a371ee3d466a7bd06fb0ad83743..f46efd86363161412cb25be237174dfd818dd4bc 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
@@ -22,42 +22,6 @@ BOOLEAN   mResetRequired  = FALSE;
 \r
 extern UINT16 gPlatformBootTimeOutDefault;\r
 \r
 \r
 extern UINT16 gPlatformBootTimeOutDefault;\r
 \r

-\r
-/**\r
-  Return the default value for system Timeout variable.\r
-\r
-  @return Timeout value.\r
-\r
-**/\r
-UINT16\r
-EFIAPI\r
-BdsLibGetTimeout (\r
-  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
-}\r
-\r

 /**\r
   The function will go through the driver option link list, load and start\r
   every driver the driver option device path point to.\r
 /**\r
   The function will go through the driver option link list, load and start\r
   every driver the driver option device path point to.\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index 722573055cc07930924a108ff2f59181e4807800..baa777df2c977442a42173cba934820336d31f91 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -113,5 +113,4 @@
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
 \r
 [Pcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
index 8779573b3827975495a9b91ab4763b9567fac957..077718a041d4389b2fe7848e0bc1fe697961242e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
@@ -63,7 +63,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/CapsuleLib.h>\r
 #include <Library/HiiLib.h>\r
 #include <Library/ExtendedHiiLib.h>\r
 #include <Library/CapsuleLib.h>\r
 #include <Library/HiiLib.h>\r
 #include <Library/ExtendedHiiLib.h>\r

-\r
+#include <Library/PcdLib.h>\r

 \r
 #include <Library/GenericBdsLib.h>\r
 #include <Library/PlatformBdsLib.h>\r
 \r
 #include <Library/GenericBdsLib.h>\r
 #include <Library/PlatformBdsLib.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index 34c38ad68283f7e2a6eb9575316f464b4d925a61..cd89b77eab08f9a7b183a01a095113275e3b2037 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -111,7 +111,8 @@
   UefiDriverEntryPoint\r
   PlatformBdsLib\r
   CapsuleLib\r
   UefiDriverEntryPoint\r
   PlatformBdsLib\r
   CapsuleLib\r

-\r
+  PcdLib\r
+  \r

 [Guids]\r
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)\r
                                                 ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)\r
 [Guids]\r
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)\r
                                                 ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)\r


@@ -170,7 +171,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r

-\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
+  \r

 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 4598d3d186140300af2ff430bf3d2d2b73744253..d935347487475387f415ba5e942395749b3996dd 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -610,16 +610,7 @@ ApplyChangeHandler (
     break;\r
 \r
   case FORM_TIME_OUT_ID:\r
     break;\r
 \r
   case FORM_TIME_OUT_ID:\r

-    Status = gRT->SetVariable (\r
-                    L"Timeout",\r
-                    &gEfiGlobalVariableGuid,\r
-                    VAR_FLAG,\r
-                    sizeof (UINT16),\r
-                    &(CurrentFakeNVMap->BootTimeOut)\r
-                    );\r
-    if (EFI_ERROR (Status)) {\r
-      goto Error;\r
-    }\r
+    PcdSet16 (PcdPlatformBootTimeOut, CurrentFakeNVMap->BootTimeOut);\r

 \r
     Private->BmmOldFakeNVData.BootTimeOut = CurrentFakeNVMap->BootTimeOut;\r
     break;\r
 \r
     Private->BmmOldFakeNVData.BootTimeOut = CurrentFakeNVMap->BootTimeOut;\r
     break;\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index be47ddfe1e01be09e5f9dbbf62a6e8a754ba3e32..6831289addd20b009cf24cf60024a5a2f1c61def 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -651,7 +651,7 @@ UpdateTimeOutPage (
 \r
   UpdatePageStart (CallbackData);\r
 \r
 \r
   UpdatePageStart (CallbackData);\r
 \r

-  BootTimeOut = BdsLibGetTimeout ();\r
+  BootTimeOut = PcdGet16 (PcdPlatformBootTimeOut);\r

 \r
   CreateNumericOpCode (\r
     (EFI_QUESTION_ID) BOOT_TIME_OUT_QUESTION_ID,\r
 \r
   CreateNumericOpCode (\r
     (EFI_QUESTION_ID) BOOT_TIME_OUT_QUESTION_ID,\r