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

update

Browse source
This commit is contained in:
Travis Staton 2023-02-21 20:15:09 -05:00
parent 9ba390ca28
commit 3263812697
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -6,8 +6,5 @@
outputs = { self }: { outputs = { self }: {
overlay = import ./overlay; overlay = import ./overlay;
rpi = import ./rpi { overlay = self.overlay; }; rpi = import ./rpi { overlay = self.overlay; };
rpi-3b-plus = import ./rpi-3b-plus self.rpi;
rpi-4b = import ./rpi-4b self.rpi;
rpi-zero-2-w = import ./rpi-zero-2-w self.rpi;
}; };
} }

18
overlay/default.nix
View file

@ -1,5 +1,9 @@
final: prev: final: prev:
let let
# The version to stick at `pkgs.rpi-kernels.latest'
latest = "v5_15_87";
# Helpers for building the `pkgs.rpi-kernels' map.
rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }: rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }:
let let
new-kernel = prev.linux_rpi4.override { new-kernel = prev.linux_rpi4.override {
@ -54,8 +58,10 @@ in {
CONFIG_OF_BOARD=y CONFIG_OF_BOARD=y
''; '';
}; };
raspberrypiWirelessFirmware = final.rpi-kernels.v5_15_87.wireless-firmware;
raspberrypifw = final.rpi-kernels.v5_15_87.firmware; # default to latest firmware
raspberrypiWirelessFirmware = final.rpi-kernels.latest.wireless-firmware;
raspberrypifw = final.rpi-kernels.latest.firmware;
} // { } // {
# rpi kernels and firmware are available at # rpi kernels and firmware are available at
@ -92,10 +98,12 @@ in {
fw = prev.fetchFromGitHub { fw = prev.fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = "2e7137e0840f76f056589aba7f82d5b7236d8f1c"; rev = "78852e166b4cf3ebb31d051e996d54792f0994b0";
sha256 = "jIKhQxp9D83OAZ8X2Vra9THHBE0j5Z2gRMDSVqIhopY="; sha256 = "tdaH+zZwmILNFBge2gMqtzj/1Hydj9cxhPvhw+7jTrU=";
}; };
wireless-fw = import ./raspberrypi-wireless-firmware/5.10.87.nix; wireless-fw = import ./raspberrypi-wireless-firmware/5.10.87.nix;
} }
]; ] // {
latest = final.rpi-kernels."${latest}";
};
} }

3
rpi/default.nix
View file

@ -13,7 +13,7 @@
"pcie_brcmstb" # required for the pcie bus to work "pcie_brcmstb" # required for the pcie bus to work
"reset-raspberrypi" # required for vl805 firmware to load "reset-raspberrypi" # required for vl805 firmware to load
]; ];
kernelPackages = pkgs.linuxPackagesFor (pkgs.rpi-kernels.v5_15_87.kernel); kernelPackages = pkgs.linuxPackagesFor (pkgs.rpi-kernels.latest.kernel);
loader = { loader = {
grub.enable = lib.mkDefault false; grub.enable = lib.mkDefault false;
@ -26,5 +26,4 @@
}; };
}; };
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
} }

5
sd-image/default.nix
View file

@ -26,6 +26,8 @@
enable_gic=1 enable_gic=1
armstub=armstub8-gic.bin armstub=armstub8-gic.bin
arm_boost=1 arm_boost=1
dtoverlay=vc4-fkms-v3d-pi4
dtoverlay=
# Otherwise the resolution will be weird in most cases, compared to # Otherwise the resolution will be weird in most cases, compared to
# what the pi3 firmware does by default. # what the pi3 firmware does by default.
@ -65,6 +67,9 @@
# Add pi-zero-2 specific files # Add pi-zero-2 specific files
cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2.dtb firmware/ cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2.dtb firmware/
cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2-w.dtb firmware/ cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2-w.dtb firmware/
# Add overlays
cp -r ${raspberrypifw}/share/raspberrypi/boot/overlays firmware/
''; '';
populateRootCommands = '' populateRootCommands = ''
mkdir -p ./files/boot mkdir -p ./files/boot