Update the default value of PcdPlatformBootTimeOutDefault to be 0xffff to be complian...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5963 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c b/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c
index 56b9f8537ee0ed0bb0c22d8de0aec61c3e28b30c..9482cbe119253a62c1bdc2eada787dd6872e4cc3 100644 (file)
--- a/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c
+++ b/MdeModulePkg/Library/GenericBdsLib/BdsMisc.c
@@ -45,27 +45,16 @@ BdsLibGetTimeout (
   //\r
   Size    = sizeof (UINT16);\r
   Status  = gRT->GetVariable (L"Timeout", &gEfiGlobalVariableGuid, NULL, &Size, &Timeout);\r
-  if (!EFI_ERROR (Status)) {\r
-    return 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
-  // To make the current EFI Automatic-Test activity possible, just add\r
-  // following code to make AutoBoot enabled when this variable is not\r
-  // present.\r
-  // This code should be removed later.\r
-  //\r
-  Timeout = PcdGet16 (PcdPlatformBootTimeOutDefault);\r
 \r
-  //\r
-  // Notes: Platform should set default variable if non exists on all error cases!!!\r
-  //\r
-  Status = gRT->SetVariable (\r
-                  L"Timeout",\r
-                  &gEfiGlobalVariableGuid,\r
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-                  sizeof (UINT16),\r
-                  &Timeout\r
-                  );\r
   return Timeout;\r
 }\r
 \r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 7dcb1f133b9f047e6d759231d87efb06dca245af..c21a2a032368300adfcab6384117b59d4692df28 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -365,7 +365,7 @@
 \r
   ## Default timeout value for displaying progressing bar in before boot OS.\r
   #  This value can be changed in BDS.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|10|UINT16|0x40000001\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001\r
 \r
   ## Error level for hardware recorder.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|1|UINT16|0x40000002\r
@@ -423,7 +423,7 @@
 \r
   ## Default timeout value for displaying progressing bar in before boot OS.\r
   #  This value can be changed in BDS.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|10|UINT16|0x40000001\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001\r
 \r
   ## Error level for hardware recorder.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|1|UINT16|0x40000002\r
@@ -464,7 +464,7 @@
 \r
   ## Default timeout value for displaying progressing bar in before boot OS.\r
   #  This value can be changed in BDS.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|10|UINT16|0x40000001\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|0xffff|UINT16|0x40000001\r
 \r
   ## Error level for hardware recorder.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|1|UINT16|0x40000002\r