ArmVirtPkg/PlatformBootManagerLib: link against UefiBootManagerLib

The general BDS helper functions are now provided by MdeModulePkg's
UefiBootManagerLib, and no longer by IntelFrameworkModulePkg's
GenericBdsLib.

This patch parallels OvmfPkg commit 2b23b8d45b62.

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/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 56f0ea8ff77a8ba8ab2a597f06908aa1d5d3f1ee..3157b89980b71f06e677e66e39b1df277660608a 100644 (file)
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -19,6 +19,7 @@
 #include <Library/DevicePathLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/QemuBootOrderLib.h>\r
+#include <Library/UefiBootManagerLib.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/GraphicsOutput.h>\r
 #include <Protocol/PciIo.h>\r

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index d2013b0f60a68ba1f97241d7fc11958576f8a8bd..2be987f9eb4b50ad441105290d77ef5df89b76b3 100644 (file)
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -46,12 +46,12 @@
   BaseMemoryLib\r
   DebugLib\r
   DevicePathLib\r
-  GenericBdsLib\r
   MemoryAllocationLib\r
   PcdLib\r
   PrintLib\r
   QemuBootOrderLib\r
   QemuFwCfgLib\r
+  UefiBootManagerLib\r
   UefiBootServicesTableLib\r
   UefiLib\r
   UefiRuntimeServicesTableLib\r