colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpi u-boot patch: simplify

This commit is contained in:
colin 2022-06-02 15:29:09 -07:00
parent a7259279bb
commit 3a937e7a15
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixpatches/02-rpi4-uboot.patch
View File

@ -1,19 +1,16 @@
diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
index a4352ab9a24..da369141607 100644 index a4352ab9a24..8a191e0f694 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix --- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
@@ -15,8 +15,13 @@ let @@ -16,7 +16,10 @@ let
pkgs.ubootRaspberryPi3_64bit
else else
pkgs.ubootRaspberryPi3_32bit pkgs.ubootRaspberryPi3_32bit
+ else if version == 4 then else
- throw "U-Boot is not yet supported on the raspberry pi 4.";
+ if isAarch64 then + if isAarch64 then
+ pkgs.ubootRaspberryPi4_64bit + pkgs.ubootRaspberryPi4_64bit
+ else + else
+ pkgs.ubootRaspberryPi4_32bit + pkgs.ubootRaspberryPi4_32bit;
else
- throw "U-Boot is not yet supported on the raspberry pi 4.";
+ throw "unknown raspberry pi version.";
extlinuxConfBuilder = extlinuxConfBuilder =
import ../generic-extlinux-compatible/extlinux-conf-builder.nix { import ../generic-extlinux-compatible/extlinux-conf-builder.nix {