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

kernel 5.15.56

Browse source
This commit is contained in:
Travis Staton 2022-08-24 09:49:19 -04:00
parent 3d7a565149
commit c82e21e828
3 changed files with 61 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

82
overlay/default.nix
View file

@ -1,4 +1,22 @@
final: prev: { final: prev:
let
rpi-kernel = { kernel, version, fw }:
let
new-kernel = prev.linux_rpi4.override {
argsOverride = {
src = kernel;
inherit version;
modDirVersion = version;
};
};
new-fw = prev.raspberrypifw.overrideAttrs (oldfw: { src = fw; });
version-slug = builtins.replaceStrings [ "." ] [ "_" ] version;
in {
"linux_rpi-${version-slug}" = new-kernel;
"raspberrypifw-${version-slug}" = new-fw;
};
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
in {
# newer version of libcamera # newer version of libcamera
libcamera = prev.libcamera.overrideAttrs (old: { libcamera = prev.libcamera.overrideAttrs (old: {
src = prev.fetchgit { src = prev.fetchgit {
@ -12,40 +30,48 @@ final: prev: {
libcamera-apps = final.callPackage ./libcamera-apps.nix { }; libcamera-apps = final.callPackage ./libcamera-apps.nix { };
# newer version of rpi firmware
raspberrypifw = prev.raspberrypifw.overrideAttrs (old: {
src = prev.fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = "2cf8a179b3f2e6e5e5ceba4e8e544def10a49020";
sha256 = "YG1bryflbV3W62MhZ/XMSgUJXMhCl/fe86x+CT7XZ4U=";
};
});
# provide generic rpi arm64 u-boot # provide generic rpi arm64 u-boot
uboot_rpi_arm64 = prev.buildUBoot rec { uboot_rpi_arm64 = prev.buildUBoot rec {
defconfig = "rpi_arm64_defconfig"; defconfig = "rpi_arm64_defconfig";
extraMeta.platforms = [ "aarch64-linux" ]; extraMeta.platforms = [ "aarch64-linux" ];
filesToInstall = [ "u-boot.bin" ]; filesToInstall = [ "u-boot.bin" ];
version = "2022.04"; version = "2022.07";
src = prev.fetchurl { src = prev.fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
sha256 = "1l5w13dznj0z1ibqv2d6ljx2ma1gnf5x5ay3dqkqwxr6750nbq38"; sha256 = "0png7p8k6rwbmmcyhc22xczcaz7kx0dafw5zmp0i9ni4kjs8xc4j";
}; };
}; };
} // (rpi-kernels [
# use a newer version of the rpi linux kernel fork {
linux_rpi = prev.linux_rpi4.override { version = "5.15.36";
argsOverride = rec { kernel = prev.fetchFromGitHub {
src = prev.fetchFromGitHub { owner = "raspberrypi";
owner = "raspberrypi"; repo = "linux";
repo = "linux"; rev = "9af1cc301e4dffb830025207a54d0bc63bec16c7";
rev = "9af1cc301e4dffb830025207a54d0bc63bec16c7"; sha256 = "fsMTUdz1XZhPaSXpU1uBV4V4VxoZKi6cwP0QJcrCy1o=";
sha256 = "fsMTUdz1XZhPaSXpU1uBV4V4VxoZKi6cwP0QJcrCy1o="; fetchSubmodules = true;
fetchSubmodules = true;
};
version = "5.15.36";
modDirVersion = "5.15.36";
}; };
}; fw = prev.fetchFromGitHub {
} owner = "raspberrypi";
repo = "firmware";
rev = "2cf8a179b3f2e6e5e5ceba4e8e544def10a49020";
sha256 = "YG1bryflbV3W62MhZ/XMSgUJXMhCl/fe86x+CT7XZ4U=";
};
}
{
version = "5.15.56";
kernel = prev.fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
rev = "912b039b7c55d40ae930f2602e45c66055c375a8";
sha256 = "igtTOPbDw9FJAzZe7u4trCkHLOIQX0RZdUwtWpBX1Ag=";
fetchSubmodules = true;
};
fw = prev.fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = "e1e3dc004ec45c0a6ab3f32eb02c1e0c8846796c";
sha256 = "Smn3wQ81zzmj+Wpt2Xwby+0Zt7YGhmhlaEscbaZaMmI=";
};
}
])

2
rpi/default.nix
View file

@ -13,7 +13,7 @@
nixpkgs = { overlays = [ overlay ]; }; nixpkgs = { overlays = [ overlay ]; };
boot = { boot = {
kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_rpi); kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_rpi-5_15_56);
initrd.availableKernelModules = [ "usbhid" "usb_storage" "vc4" ]; initrd.availableKernelModules = [ "usbhid" "usb_storage" "vc4" ];
loader = { loader = {

11
sd-image/default.nix
View file

@ -17,6 +17,7 @@ stable:
sdImage = { sdImage = {
populateFirmwareCommands = let populateFirmwareCommands = let
raspberrypifw = pkgs.raspberrypifw-5_15_56;
configTxt = pkgs.writeText "config.txt" '' configTxt = pkgs.writeText "config.txt" ''
[pi02] [pi02]
kernel=u-boot-rpi_arm64.bin kernel=u-boot-rpi_arm64.bin
@ -48,7 +49,7 @@ stable:
avoid_warnings=1 avoid_warnings=1
''; '';
in '' in ''
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) (cd ${raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/)
# Add the config # Add the config
cp ${configTxt} firmware/config.txt cp ${configTxt} firmware/config.txt
@ -57,16 +58,16 @@ stable:
cp ${pkgs.uboot_rpi_arm64}/u-boot.bin firmware/u-boot-rpi_arm64.bin cp ${pkgs.uboot_rpi_arm64}/u-boot.bin firmware/u-boot-rpi_arm64.bin
# Add pi3 specific files # Add pi3 specific files
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-3-b-plus.dtb firmware/ cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-3-b-plus.dtb firmware/
# Add pi4 specific files # Add pi4 specific files
cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin
cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/ cp ${raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/
# Add pi-zero-2 specific files # Add pi-zero-2 specific files
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2.dtb firmware/ cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2-w.dtb firmware/ cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2-w.dtb firmware/
''; '';
populateRootCommands = '' populateRootCommands = ''
mkdir -p ./files/boot mkdir -p ./files/boot