summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2016-05-05 15:58:56 +0200
committerLaszlo Ersek <lersek@redhat.com>2016-05-06 10:04:49 +0200
commitb7a33aff2630bedab7e8102ba8fcd7eee12d39f9 (patch)
tree062b4b267974b8e8f4b63fa42b1cd8af42df3606
parente3fe3c0ff94d96b8a03a169fecab49a5f5cc0c11 (diff)
downloadedk2-b7a33aff2630bedab7e8102ba8fcd7eee12d39f9.tar.gz
edk2-b7a33aff2630bedab7e8102ba8fcd7eee12d39f9.tar.bz2
edk2-b7a33aff2630bedab7e8102ba8fcd7eee12d39f9.zip
ArmVirtPkg/PlatformBootManagerLib: use EfiBootManagerUpdateConsoleVariable
In this rather mechanical patch, we replace the calls to GenericBdsLib's BdsLibUpdateConsoleVariable() with calls to UefiBootManagerLib's EfiBootManagerUpdateConsoleVariable(), which has the same purpose. The latter uses CONSOLE_TYPE enum constants from "MdeModulePkg/Include/Library/UefiBootManagerLib.h", for identifying the console type / underlying UEFI variable in the first parameter. This patch parallels OvmfPkg commit 9dc08ec6574b. 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>
-rw-r--r--ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 4920621e5d..56f0ea8ff7 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -329,14 +329,14 @@ AddOutput (
return;
}
- Status = BdsLibUpdateConsoleVariable (L"ConOut", DevicePath, NULL);
+ Status = EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: %s: adding to ConOut: %r\n", __FUNCTION__,
ReportText, Status));
return;
}
- Status = BdsLibUpdateConsoleVariable (L"ErrOut", DevicePath, NULL);
+ Status = EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "%a: %s: adding to ErrOut: %r\n", __FUNCTION__,
ReportText, Status));
@@ -393,7 +393,7 @@ PlatformBootManagerAfterConsole (
//
// Add the hardcoded short-form USB keyboard device path to ConIn.
//
- BdsLibUpdateConsoleVariable (L"ConIn",
+ EfiBootManagerUpdateConsoleVariable (ConIn,
(EFI_DEVICE_PATH_PROTOCOL *)&mUsbKeyboard, NULL);
//
@@ -401,11 +401,11 @@ PlatformBootManagerAfterConsole (
//
CopyGuid (&mSerialConsole.TermType.Guid,
PcdGetPtr (PcdTerminalTypeGuidBuffer));
- BdsLibUpdateConsoleVariable (L"ConIn",
+ EfiBootManagerUpdateConsoleVariable (ConIn,
(EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
- BdsLibUpdateConsoleVariable (L"ConOut",
+ EfiBootManagerUpdateConsoleVariable (ConOut,
(EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
- BdsLibUpdateConsoleVariable (L"ErrOut",
+ EfiBootManagerUpdateConsoleVariable (ErrOut,
(EFI_DEVICE_PATH_PROTOCOL *)&mSerialConsole, NULL);
//