Merge pull request #55 from dorkeline/uboot-add-package-option-2

This commit is contained in:
Travis Staton 2024-08-24 13:56:43 -04:00 committed by GitHub
commit d37f25bf2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -101,7 +101,6 @@ 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"
@ -114,7 +113,7 @@ in
CONFIG="${config.hardware.raspberry-pi.config-output}" CONFIG="${config.hardware.raspberry-pi.config-output}"
${lib.strings.optionalString cfg.uboot.enable '' ${lib.strings.optionalString cfg.uboot.enable ''
UBOOT="${pkgs.uboot-rpi-arm64}/u-boot.bin" UBOOT="${cfg.uboot.package}/u-boot.bin"
migrate_uboot() { migrate_uboot() {
echo "migrating uboot" echo "migrating uboot"