ArmVirtPkg/PlatformBootManagerLib: don't launch the Boot Manager Menu

MdeModulePkg/BDS doesn't launch the UI (Boot Manager Menu) from the
platform side. The platform is expected to store the boot timeout only, in
PcdPlatformBootTimeOut. This is usually done in
PlatformBootManagerBeforeConsole().

(ArmVirtXen is not modified, as it uses PlatformIntelBdsLib from
ArmPlatformPkg, not ArmVirtPkg.)

The patch parallels OvmfPkg commit 8dc0f0a6aab0.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Ruiyu Ni <ruiyu.ni@Intel.com>

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 34323bf83d6427ba54a7a8e91ad91539535851e1..9a8038dc0a40990ed3f017596f04f13585168543 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -139,7 +139,6 @@
 !else\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
   #\r
   # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM\r
@@ -191,6 +190,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20\r
 \r
 [PcdsDynamicDefault.common]\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
+\r
   ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI\r
   #  enumeration to complete before installing ACPI tables.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 42e01135f89918c2fdae061bc52cd3c68244d455..aaf177d0914e5ad4eec575b15a9852161d6de7f1 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -128,7 +128,6 @@
 !else\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
   #\r
   # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM\r
@@ -179,6 +178,8 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40\r
 \r
 [PcdsDynamicDefault.common]\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
+\r
   ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI\r
   #  enumeration to complete before installing ACPI tables.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE\r

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 81cee15af95b22d7a9a27e90205c569332597a4e..b114420fd020f5f2f7ce6b20f325e44ed6344c41 100644 (file)
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -390,6 +390,11 @@ PlatformBootManagerBeforeConsole (
     (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);\r
   EfiBootManagerUpdateConsoleVariable (ErrOut,\r
     (EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);\r
+\r
+  //\r
+  // Set the front page timeout from the QEMU configuration.\r
+  //\r
+  PcdSet16 (PcdPlatformBootTimeOut, GetFrontPageTimeoutFromQemu ());\r
 }\r
 \r
 /**\r
@@ -434,8 +439,6 @@ PlatformBootManagerAfterConsole (
   // it.\r
   //\r
   BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder");\r
-\r
-  PlatformBdsEnterFrontPage (GetFrontPageTimeoutFromQemu(), TRUE);\r
 }\r
 \r
 /**\r

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h
index 410c309cfcbff26c816e0d92b0ceb45ccef16e6b..df1519c24175e7f84c234b1eec444b561c377eee 100644 (file)
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h
@@ -26,12 +26,6 @@
 #include <Library/UefiLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 \r
-VOID\r
-PlatformBdsEnterFrontPage (\r
-  IN UINT16                 TimeoutDefault,\r
-  IN BOOLEAN                ConnectAllHappened\r
-  );\r
-\r
 /**\r
   Download the kernel, the initial ramdisk, and the kernel command line from\r
   QEMU's fw_cfg. Construct a minimal SimpleFileSystem that contains the two\r

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 2be987f9eb4b50ad441105290d77ef5df89b76b3..bbadea705e6f83361869313af6f7756ace474acf 100644 (file)
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -65,6 +65,7 @@
 \r
 [Pcd]\r
   gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
 \r
 [Guids]\r
   gEfiFileInfoGuid\r