nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 19:46:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use config.system.boot.loader.kernelFile

Browse source
This commit is contained in:
Travis Staton 2024-11-04 22:57:26 -05:00
parent 5c1f3831f9
commit 61d43e92fd
No known key found for this signature in database
GPG key ID: E883E53CDAC16260
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpi/default.nix
View file

@ -102,7 +102,7 @@ in
TARGET_FIRMWARE_DIR="${firmware-path}" TARGET_FIRMWARE_DIR="${firmware-path}"
TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays" TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays"
TMPFILE="$TARGET_FIRMWARE_DIR/tmp" TMPFILE="$TARGET_FIRMWARE_DIR/tmp"
KERNEL="${kernel}/Image" KERNEL="${kernel}/${config.system.boot.loader.kernelFile}"
SHOULD_UBOOT=${if cfg.uboot.enable then "1" else "0"} SHOULD_UBOOT=${if cfg.uboot.enable then "1" else "0"}
SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot" SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot"
STARTFILES=("$SRC_FIRMWARE_DIR"/start*.elf) STARTFILES=("$SRC_FIRMWARE_DIR"/start*.elf)

4
sd-image/default.nix
View file

@ -31,7 +31,7 @@
cfg = config.raspberry-pi-nix; cfg = config.raspberry-pi-nix;
version = cfg.kernel-version; version = cfg.kernel-version;
board = cfg.board; board = cfg.board;
kernel = config.system.build.kernel; kernel = "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}";
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
populate-kernel = populate-kernel =
if cfg.uboot.enable if cfg.uboot.enable
@ -39,7 +39,7 @@
cp ${cfg.uboot.package}/u-boot.bin firmware/u-boot-rpi-arm64.bin cp ${cfg.uboot.package}/u-boot.bin firmware/u-boot-rpi-arm64.bin
'' ''
else '' else ''
cp "${kernel}/Image" firmware/kernel.img cp "${kernel}" firmware/kernel.img
cp "${initrd}" firmware/initrd cp "${initrd}" firmware/initrd
cp "${kernel-params}" firmware/cmdline.txt cp "${kernel-params}" firmware/cmdline.txt
''; '';