gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raspberrypi-bootloader: support Raspberry Pi 3 w/o U-Boot and explicitly support

Browse Source 
Raspberry Pi Zero
This commit is contained in:
Ben Wolsieffer
2018-09-10 23:21:41 -04:00
committed by Tuomas Tynkkynen
parent bcb9e17bba
commit 1afff7c10b
5 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View File

@@ -7,8 +7,8 @@ let
inherit (pkgs.stdenv.hostPlatform) platform;
builderUboot = import ./builder_uboot.nix { inherit config pkgs configTxt; };
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
builder =
if cfg.uboot.enable then
@@ -34,9 +34,11 @@ let
'' + optional isAarch64 ''
# Boot in 64-bit mode.
arm_control=0x200
'' + optional cfg.uboot.enable ''
'' + (if cfg.uboot.enable then ''
kernel=u-boot-rpi.bin
'' + optional (cfg.firmwareConfig != null) cfg.firmwareConfig);
'' else ''
kernel=kernel.img
'') + optional (cfg.firmwareConfig != null) cfg.firmwareConfig);
in
@@ -56,7 +58,7 @@ in
version = mkOption {
default = 2;
type = types.enum [ 1 2 3 ];
type = types.enum [ 0 1 2 3 ];
description = ''
'';
};