OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones

[mirror_edk2.git] / OvmfPkg / QemuFlashFvbServicesRuntimeDxe / FwBlockServiceDxe.c

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
index 69b20916bc7ce582430a88470281eeee30be4b66..1f285e008372b069dd26bf991342ff247d26abb0 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
@@ -44,7 +44,7 @@ InstallProtocolInterfaces (
     // LocateDevicePath fails so install a new interface and device path\r
     //\r
     FwbHandle = NULL;\r
-    DEBUG ((EFI_D_INFO, "Installing QEMU flash FVB\n"));\r
+    DEBUG ((DEBUG_INFO, "Installing QEMU flash FVB\n"));\r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
                     &FwbHandle,\r
                     &gEfiFirmwareVolumeBlockProtocolGuid,\r
@@ -65,7 +65,7 @@ InstallProtocolInterfaces (
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    DEBUG ((EFI_D_INFO, "Reinstalling FVB for QEMU flash region\n"));\r
+    DEBUG ((DEBUG_INFO, "Reinstalling FVB for QEMU flash region\n"));\r
     Status = gBS->ReinstallProtocolInterface (\r
                     FwbHandle,\r
                     &gEfiFirmwareVolumeBlockProtocolGuid,\r
@@ -216,3 +216,30 @@ MarkIoMemoryRangeForRuntimeAccess (
 \r
   return Status;\r
 }\r
+\r
+VOID\r
+SetPcdFlashNvStorageBaseAddresses (\r
+  VOID\r
+  )\r
+{\r
+  RETURN_STATUS PcdStatus;\r
+\r
+  //\r
+  // Set several PCD values to point to flash\r
+  //\r
+  PcdStatus = PcdSet64S (\r
+    PcdFlashNvStorageVariableBase64,\r
+    (UINTN) PcdGet32 (PcdOvmfFlashNvStorageVariableBase)\r
+    );\r
+  ASSERT_RETURN_ERROR (PcdStatus);\r
+  PcdStatus = PcdSet32S (\r
+    PcdFlashNvStorageFtwWorkingBase,\r
+    PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase)\r
+    );\r
+  ASSERT_RETURN_ERROR (PcdStatus);\r
+  PcdStatus = PcdSet32S (\r
+    PcdFlashNvStorageFtwSpareBase,\r
+    PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase)\r
+    );\r
+  ASSERT_RETURN_ERROR (PcdStatus);\r
+}\r