[Bug 285554] sysutils/edk2: Update to 202505

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285554

Michael Reifenberger <mr@FreeBSD.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mr@FreeBSD.org

--- Comment #9 from Michael Reifenberger <mr@FreeBSD.org> ---
Hi,
I get the following rejects:
...
----
(r1)() # cat ./files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c.rej
./files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c.rej
@@ -1,38 +0,0 @@
---- OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c.orig  2023-09-07 08:35:06 UTC
-+++ OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c
-@@ -259,19 +259,17 @@ InstallAcpiTables (
-              BHYVE_BIOS_PHYSICAL_END,
-              &Rsdp
-              );
--  if (EFI_ERROR (Status)) {
--    return Status;
--  }
--
--  Status = InstallAcpiTablesFromRsdp (
--             AcpiTable,
--             Rsdp
--             );
-   if (!EFI_ERROR (Status)) {
--    return EFI_SUCCESS;
-+    Status = InstallAcpiTablesFromRsdp (
-+              AcpiTable,
-+              Rsdp
-+              );
-+    if (!EFI_ERROR (Status)) {
-+      return EFI_SUCCESS;
-+    }
-   }
- 
--  if (Status != EFI_NOT_FOUND) {
-+  if (EFI_ERROR (Status)) {
-     DEBUG (
-       (
-        DEBUG_WARN,
-@@ -280,7 +278,6 @@ InstallAcpiTables (
-        Status
-       )
-       );
--    return Status;
-   }
- 
-   Status = InstallOvmfFvTables (AcpiTable);
@@ -1,13 +0,0 @@
---- OvmfPkg/Bhyve/PlatformPei/Platform.c.orig  2023-11-17 12:26:16 UTC
-+++ OvmfPkg/Bhyve/PlatformPei/Platform.c
-@@ -153,8 +153,8 @@ MemMapInitialization (
-   UINT64         PciIoSize;
-   RETURN_STATUS  PcdStatus;
- 
--  PciIoBase = 0xC000;
--  PciIoSize = 0x4000;
-+  PciIoBase = 0x2000;
-+  PciIoSize = 0xE000;
- 
-   //
-   // Create Memory Type Information HOB
...
----

-- 
You are receiving this mail because:
You are the assignee for the bug.