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

diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
index f4d32f1a57bc990a5d689d3fa5f3ce316819e961..84a56faf760db1ab913249275192cceb503c8dd0 100644 (file)
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
@@ -332,7 +332,7 @@ Returns:
   //\r
   // Init the time out value\r
   //\r
-  Timeout = BdsLibGetTimeout ();\r
+  Timeout = PcdGet16 (PcdPlatformBootTimeOut);\r
 \r
   //\r
   // Load the driver option as the driver option list\r

diff --git a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
index 469f92af65d5756939b836999b458a58208c3910..10a2631a5e7a7abbeaa58d10a5a2d0f4b4e46a88 100644 (file)
--- a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
+++ b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
@@ -43,27 +43,6 @@
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
 [LibraryClasses]\r
-#  EdkGenericPlatformBdsLib\r
-#  HiiLib\r
-#  DevicePathLib\r
-#  UefiRuntimeServicesTableLib\r
-#  UefiBootServicesTableLib\r
-#  BaseMemoryLib\r
-#  MemoryAllocationLib\r
-#  EdkGenericBdsLib\r
-#  HobLib\r
-#  ReportStatusCodeLib\r
-#  EdkIfrSupportLib\r
-#  PrintLib\r
-#  PerformanceLib\r
-#  DxeServicesTableLib\r
-#  EdkGraphicsLib\r
-#  BaseLib\r
-#  UefiDriverEntryPoint\r
-#  UefiLib\r
-#  DebugLib\r
-\r
-\r
   BaseLib\r
   MemoryAllocationLib\r
   UefiBootServicesTableLib\r
@@ -82,6 +61,7 @@
 [Pcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
-\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
+  \r
 [Depex]\r
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid\r