Put QemuBootOrderLib's GetFrontPageTimeoutFromQemu() to use, so that
ArmVirtualizationPkg'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=1172756
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
---
ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
| 2 --
ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
| 18 +-----------------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git
a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
index 8db2ad5..6542705 100644
---
a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
+++
b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
@@ -22,7 +22,6 @@
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
LIBRARY_CLASS = PlatformBdsLib|DXE_DRIVER
- CONSTRUCTOR = PlatformIntelBdsConstructor
#
# The following information is for reference only and not required by the
build tools.
@@ -67,7 +66,6 @@
[Pcd]
gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
[Protocols]
gEfiDevicePathFromTextProtocolGuid
diff --git
a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
index 6fea2b0..a03e909 100644
---
a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
+++
b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
@@ -17,22 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
EXPRESS OR IMPLIED.
#include <Library/QemuBootOrderLib.h>
-///
-/// Predefined platform default time out value
-///
-UINT16 gPlatformBootTimeOutDefault;
-
-EFI_STATUS
-EFIAPI
-PlatformIntelBdsConstructor (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
- )
-{
- gPlatformBootTimeOutDefault = (UINT16)PcdGet16 (PcdPlatformBootTimeOut);
- return EFI_SUCCESS;
-}
-
//
// BDS Platform Functions
//
@@ -320,7 +304,7 @@ PlatformBdsPolicyBehavior (
//
BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder");
- PlatformBdsEnterFrontPage (gPlatformBootTimeOutDefault, TRUE);
+ PlatformBdsEnterFrontPage (GetFrontPageTimeoutFromQemu(), TRUE);
}
/**
--
1.8.3.1
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
