From ea444a3e42a61a9fbbb77401265e5d8b3bcba050 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Jan 2015 16:25:59 +0000 Subject: [PATCH] OvmfPkg: PlatformBdsLib: get front page timeout from QEMU Put QemuBootOrderLib's GetFrontPageTimeoutFromQemu() to use, so that OVMF's Platform BDS policy can consume QEMU's command line option -boot menu=on,splash-time=N RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1170507 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16611 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c | 8 +------- OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c index 341f5c1596..1e87820e93 100644 --- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1185,7 +1185,6 @@ Returns: --*/ { EFI_STATUS Status; - UINT16 Timeout; EFI_BOOT_MODE BootMode; DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior\n")); @@ -1203,11 +1202,6 @@ Returns: PlatformBdsRestoreNvVarsFromHardDisk (); } - // - // Init the time out value - // - Timeout = PcdGet16 (PcdPlatformBootTimeOut); - // // Load the driver option as the driver option list // @@ -1261,7 +1255,7 @@ Returns: // BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder"); - PlatformBdsEnterFrontPage (Timeout, TRUE); + PlatformBdsEnterFrontPage (GetFrontPageTimeoutFromQemu(), TRUE); } VOID diff --git a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf index 1adc28972a..d4f5faf7b5 100644 --- a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf +++ b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf @@ -53,7 +53,6 @@ QemuBootOrderLib [Pcd] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable -- 2.39.2