From 21e97c72eb0df7d7c2449c1a6b8ced1d09d82e05 Mon Sep 17 00:00:00 2001 From: klu2 Date: Thu, 26 Feb 2009 07:19:01 +0000 Subject: [PATCH] 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@7708 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c | 2 +- Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf | 3 ++- Nt32Pkg/Nt32Pkg.dsc | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c index 3c981fb21a..7c4d7069a6 100644 --- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c +++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c @@ -334,7 +334,7 @@ Returns: // // Init the time out value // - Timeout = BdsLibGetTimeout (); + Timeout = PcdGet16 (PcdPlatformBootTimeOut); // // Load the driver option as the driver option list diff --git a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf index 5a6e5cf1b3..1284f4d06a 100644 --- a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf +++ b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf @@ -60,6 +60,7 @@ [Pcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn - + gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut + [Depex] gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 66ca3f49f0..47771aa387 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -355,12 +355,12 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault|10 [PcdsDynamicHii.common.DEFAULT] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0x0053 0x0065 0x0074 0x0075 0x0070|gEfiWinNtSystemConfigGuid|0x0|80 # Variable: L"Setup" gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0x0053 0x0065 0x0074 0x0075 0x0070|gEfiWinNtSystemConfigGuid|0x4|25 # Variable: L"Setup" - + gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0x0054 0x0069 0x006D 0x0065 0x006F 0x0075 0x0074|gEfiGlobalVariableGuid|0x0|10 # Variable: L"Timeout" + ################################################################################################### # # Components Section - list of the modules and components that will be processed by compilation