rpi u-boot patch: simplify
This commit is contained in:
parent
a7259279bb
commit
3a937e7a15
|
@ -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
|
||||
index a4352ab9a24..da369141607 100644
|
||||
index a4352ab9a24..8a191e0f694 100644
|
||||
--- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
|
||||
+++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
|
||||
@@ -15,8 +15,13 @@ let
|
||||
pkgs.ubootRaspberryPi3_64bit
|
||||
@@ -16,7 +16,10 @@ let
|
||||
else
|
||||
pkgs.ubootRaspberryPi3_32bit
|
||||
+ else if version == 4 then
|
||||
else
|
||||
- throw "U-Boot is not yet supported on the raspberry pi 4.";
|
||||
+ if isAarch64 then
|
||||
+ pkgs.ubootRaspberryPi4_64bit
|
||||
+ else
|
||||
+ pkgs.ubootRaspberryPi4_32bit
|
||||
else
|
||||
- throw "U-Boot is not yet supported on the raspberry pi 4.";
|
||||
+ throw "unknown raspberry pi version.";
|
||||
+ pkgs.ubootRaspberryPi4_32bit;
|
||||
|
||||
extlinuxConfBuilder =
|
||||
import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
|
||||
|
|
Loading…
Reference in New Issue