Merge pull request #18 from nesteroff/fix-orin-boot

Fix NixOS booting issue on Jetson AGX Orin with Jetson Linux 34
anduril · Jan 23, 2023 · 57e5858 · 57e5858
2 parents c7ae133 + 5774dd7
commit 57e5858
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/default.nix b/default.nix
@@ -114,7 +114,7 @@ in rec {
     hardware.nvidia-jetpack.enable = true;
     networking.hostName = n; # Just so it sets the flash binary name.
   }).config)) {
-    "orin-agx-devkit" = { som = "orin-agx"; carrierBoard = "devkit"; };
+    "orin-agx-devkit" = { som = "orin-agx"; carrierBoard = "devkit"; bootloader.edk2NvidiaPatches = [ ./edk2-uefi-dtb.patch ]; };
     "xavier-agx-devkit" = { som = "xavier-agx"; carrierBoard = "devkit"; };
     "xavier-nx-devkit" = { som = "xavier-nx"; carrierBoard = "devkit"; };
     "xavier-nx-devkit-emmc" = { som = "xavier-nx-emmc"; carrierBoard = "devkit"; };

diff --git a/edk2-uefi-dtb.patch b/edk2-uefi-dtb.patch
@@ -0,0 +1,13 @@
+diff --git a/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c b/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c
+index f08ca03..a5c9cc1 100644
+--- a/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c
++++ b/Silicon/NVIDIA/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbKernelLoaderLib.c
+@@ -664,8 +664,6 @@ DtPlatformLoadDtb (
+   Status = gBS->CreateEventEx (
+                   EVT_NOTIFY_SIGNAL,
+                   TPL_CALLBACK,
+-                  PlatformType == TEGRA_PLATFORM_SILICON ?
+-                  InstallFdt :
+                   UpdateFdt,
+                   NULL,
+                   &gEfiEventReadyToBootGuid,