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

uboot: add package option

Browse source
This commit is contained in:
dorkeline 2024-08-22 11:17:24 +02:00
parent a993f0cd59
commit 9b56cda093
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpi/default.nix
View file

@ -68,6 +68,8 @@ in
cm4 with an nvme drive. cm4 with an nvme drive.
''; '';
}; };
package = mkPackageOption pkgs "uboot-rpi-arm64" {};
}; };
}; };
}; };
@ -99,6 +101,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"
UBOOT="${cfg.uboot.package}/u-boot.bin"
KERNEL="${kernel}/Image" KERNEL="${kernel}/Image"
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"
@ -118,7 +121,7 @@ in
touch "$STATE_DIRECTORY/uboot-migration-in-progress" touch "$STATE_DIRECTORY/uboot-migration-in-progress"
cp "$UBOOT" "$TMPFILE" cp "$UBOOT" "$TMPFILE"
mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin" mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin"
echo "${builtins.toString pkgs.uboot-rpi-arm64}" " > "$STATE_DIRECTORY/uboot-version" echo "${builtins.toString cfg.uboot.package}" " > "$STATE_DIRECTORY/uboot-version"
rm "$STATE_DIRECTORY/uboot-migration-in-progress" rm "$STATE_DIRECTORY/uboot-migration-in-progress"
} }
''} ''}
@ -180,7 +183,7 @@ in
${lib.strings.optionalString cfg.uboot.enable '' ${lib.strings.optionalString cfg.uboot.enable ''
if [[ "$SHOULD_UBOOT" -eq 1 ]] && [[ -f "$STATE_DIRECTORY/uboot-migration-in-progress" || ! -f "$STATE_DIRECTORY/uboot-version" || $(< "$STATE_DIRECTORY/uboot-version") != ${ if [[ "$SHOULD_UBOOT" -eq 1 ]] && [[ -f "$STATE_DIRECTORY/uboot-migration-in-progress" || ! -f "$STATE_DIRECTORY/uboot-version" || $(< "$STATE_DIRECTORY/uboot-version") != ${
builtins.toString pkgs.uboot-rpi-arm64 builtins.toString cfg.uboot.package
} ]]; then } ]]; then
migrate_uboot migrate_uboot
fi fi

2
sd-image/default.nix
View file

@ -26,7 +26,7 @@
populate-kernel = populate-kernel =
if cfg.uboot.enable if cfg.uboot.enable
then '' then ''
cp ${pkgs.uboot-rpi-arm64}/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}/Image" firmware/kernel.img