From 80df3d197e12d2ba77f67cce09d58773c1f4d7ea Mon Sep 17 00:00:00 2001 From: dorkeline <87998193+dorkeline@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:59:23 +0200 Subject: [PATCH 1/2] uboot: fix a pkgs.uboot use in the migration script i didnt catch --- rpi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpi/default.nix b/rpi/default.nix index 7116459..955529b 100644 --- a/rpi/default.nix +++ b/rpi/default.nix @@ -114,7 +114,7 @@ in CONFIG="${config.hardware.raspberry-pi.config-output}" ${lib.strings.optionalString cfg.uboot.enable '' - UBOOT="${pkgs.uboot-rpi-arm64}/u-boot.bin" + UBOOT="${cfg.uboot.package}/u-boot.bin" migrate_uboot() { echo "migrating uboot" From 3fbf83622410c1060dbcd988218cabf98dcd53ca Mon Sep 17 00:00:00 2001 From: dorkeline Date: Fri, 23 Aug 2024 20:20:53 +0200 Subject: [PATCH 2/2] uboot: remove mistakenly added line --- rpi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/rpi/default.nix b/rpi/default.nix index 955529b..e1665dc 100644 --- a/rpi/default.nix +++ b/rpi/default.nix @@ -101,7 +101,6 @@ in TARGET_FIRMWARE_DIR="${firmware-path}" TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays" TMPFILE="$TARGET_FIRMWARE_DIR/tmp" - UBOOT="${cfg.uboot.package}/u-boot.bin" KERNEL="${kernel}/Image" SHOULD_UBOOT=${if cfg.uboot.enable then "1" else "0"} SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot"