Skip to content

Commit 2d07431

Browse files
Revert "disable L4TLauncher.efi"
This reverts commit 1ea5f96.
1 parent 1ea5f96 commit 2d07431

File tree

3 files changed

+7
-21
lines changed

3 files changed

+7
-21
lines changed

device-pkgs/flash-script.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@
4848
${lib.optionalString (uefi-firmware != null) ''
4949
cp ${uefi-firmware}/uefi_jetson.bin bootloader/uefi_jetson.bin
5050
51-
# Disable installing L4TLauncher to ESP partition.
52-
rm bootloader/BOOTAA64.efi
51+
# For normal NixOS usage, we'd probably use systemd-boot or GRUB instead,
52+
# but lets replace the upstream L4TLauncher EFI payload anyway
53+
cp ${uefi-firmware}/L4TLauncher.efi bootloader/BOOTAA64.efi
5354
5455
# Replace additional dtbos
5556
cp ${uefi-firmware}/dtbs/*.dtbo kernel/dtb/

pkgs/uefi-firmware/default.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ let
8181
# PR: https://github.com/NVIDIA/edk2-nvidia/pull/76
8282
# Can't find commit from Nvidia that actually fixes PR#76
8383
./eqos-driver-fix-clock-name.patch
84-
85-
# L4TLauncher is broken and crashes boot.
86-
./disable-l4tlauncher.patch
8784

8885
./capsule-authentication.patch
8986

@@ -253,6 +250,10 @@ let
253250
${jetson-edk2-uefi}/FV/UEFI_NS.Fv \
254251
$out/uefi_jetson.bin
255252
253+
python3 ${edk2-nvidia}/Silicon/NVIDIA/Tools/FormatUefiBinary.py \
254+
${jetson-edk2-uefi}/AARCH64/L4TLauncher.efi \
255+
$out/L4TLauncher.efi
256+
256257
mkdir -p $out/dtbs
257258
for filename in ${jetson-edk2-uefi}/AARCH64/Silicon/NVIDIA/Tegra/DeviceTree/DeviceTree/OUTPUT/*.dtb; do
258259
cp $filename $out/dtbs/$(basename "$filename" ".dtb").dtbo

pkgs/uefi-firmware/disable-l4tlauncher.patch

-16
This file was deleted.

0 commit comments

Comments
 (0)