uefi-firmware: update edk2-uefi-dtb patch

anduril · Apr 8, 2024 · f82d959 · f82d959
1 parent 63b5354
commit f82d959
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkgs/uefi-firmware/default.nix b/pkgs/uefi-firmware/default.nix
@@ -88,7 +88,7 @@ let
       # using one from the kernel-dtb partition.
       # See: https://github.com/anduril/jetpack-nixos/pull/18
       # Upstream Fixed in e81614999?
-      #./edk2-uefi-dtb.patch
+      ./edk2-uefi-dtb.patch
     ];
     postPatch = lib.optionalString errorLevelInfo ''
       sed -i 's#PcdDebugPrintErrorLevel|.*#PcdDebugPrintErrorLevel|0x8000004F#' Platform/NVIDIA/NVIDIA.common.dsc.inc

diff --git a/pkgs/uefi-firmware/edk2-uefi-dtb.patch b/pkgs/uefi-firmware/edk2-uefi-dtb.patch
@@ -1,13 +1,9 @@
-diff --git a/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c b/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c
-index 1defbed..d16b86e 100644
 --- a/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c
 +++ b/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c
-@@ -705,9 +705,7 @@ DtPlatformLoadDtb (
+@@ -761,7 +761,7 @@ DtPlatformLoadDtb (
    Status = gBS->CreateEventEx (
                    EVT_NOTIFY_SIGNAL,
                    TPL_CALLBACK,
--                  UefiDtbBoot ?
--                  UpdateFdt :
 -                  InstallFdt,
 +                  UpdateFdt,
                    NULL,