diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
index f4d32f1a57..84a56faf76 100644
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
@@ -332,7 +332,7 @@ Returns:
   //
   // Init the time out value
   //
-  Timeout = BdsLibGetTimeout ();
+  Timeout = PcdGet16 (PcdPlatformBootTimeOut);
 
   //
   // Load the driver option as the driver option list
diff --git a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
index 469f92af65..10a2631a5e 100644
--- a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
+++ b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
@@ -43,27 +43,6 @@
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
 [LibraryClasses]
-#  EdkGenericPlatformBdsLib
-#  HiiLib
-#  DevicePathLib
-#  UefiRuntimeServicesTableLib
-#  UefiBootServicesTableLib
-#  BaseMemoryLib
-#  MemoryAllocationLib
-#  EdkGenericBdsLib
-#  HobLib
-#  ReportStatusCodeLib
-#  EdkIfrSupportLib
-#  PrintLib
-#  PerformanceLib
-#  DxeServicesTableLib
-#  EdkGraphicsLib
-#  BaseLib
-#  UefiDriverEntryPoint
-#  UefiLib
-#  DebugLib
-
-
   BaseLib
   MemoryAllocationLib
   UefiBootServicesTableLib
@@ -82,6 +61,7 @@
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
-
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+  
 [Depex]
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid