nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-09 03:56:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from tstat/kernel-6.1

Browse source 
Kernel 6.1
This commit is contained in:
Travis Staton 2023-06-12 10:48:34 -04:00 • committed by GitHub
commit da5b77e661
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 141 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -3,16 +3,16 @@
"libcamera-apps-src": { "libcamera-apps-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1674645888, "lastModified": 1677660281,
"narHash": "sha256-UBTDHN0lMj02enB8im4Q+f/MCm/G2mFPP3pLImrZc5A=", "narHash": "sha256-A6UriYk8bHRL6wp6ehXOnUnbJH2/mNDkxwGemD/UYpw=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "libcamera-apps", "repo": "libcamera-apps",
"rev": "9f08463997b82c4bf60e12c4ea43577959a8ae15", "rev": "54a781dffdd101954dcfa6acd0bd80006f67da83",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "v1.1.1", "ref": "v1.1.2",
"repo": "libcamera-apps", "repo": "libcamera-apps",
"type": "github" "type": "github"
} }
@ -22,9 +22,8 @@
"libcamera-apps-src": "libcamera-apps-src", "libcamera-apps-src": "libcamera-apps-src",
"rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
"rpi-firmware-stable-src": "rpi-firmware-stable-src", "rpi-firmware-src": "rpi-firmware-src",
"rpi-linux-5_15-src": "rpi-linux-5_15-src", "rpi-linux-6_1-src": "rpi-linux-6_1-src",
"rpi-linux-5_15_87-src": "rpi-linux-5_15_87-src",
"u-boot-src": "u-boot-src" "u-boot-src": "u-boot-src"
} }
}, },
@ -47,11 +46,11 @@
"rpi-firmware-nonfree-src": { "rpi-firmware-nonfree-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1674638139, "lastModified": 1683107406,
"narHash": "sha256-54JKmwypD7PRQdd7k6IcF7wL8ifMavEM0UwZwmA24O4=", "narHash": "sha256-9UgB8f2AaxG7S5Px46jOP9wUeO1VXKB0uJiPWh32oDI=",
"owner": "RPi-Distro", "owner": "RPi-Distro",
"repo": "firmware-nonfree", "repo": "firmware-nonfree",
"rev": "7f29411baead874b859eda53efdc2472345ea454", "rev": "2b465a10b04555b7f45b3acb85959c594922a3ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,14 +59,14 @@
"type": "github" "type": "github"
} }
}, },
"rpi-firmware-stable-src": { "rpi-firmware-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673003776, "lastModified": 1680694337,
"narHash": "sha256-tdaH+zZwmILNFBge2gMqtzj/1Hydj9cxhPvhw+7jTrU=", "narHash": "sha256-UtUd1MbsrDFxd/1C3eOAMDKPZMx+kSMFYOJP+Kc6IU8=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "firmware", "repo": "firmware",
"rev": "78852e166b4cf3ebb31d051e996d54792f0994b0", "rev": "055e044d5359ded1aacc5a17a8e35365373d0b8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,40 +76,23 @@
"type": "github" "type": "github"
} }
}, },
"rpi-linux-5_15-src": { "rpi-linux-6_1-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1675874870, "lastModified": 1680464256,
"narHash": "sha256-oy+VgoB4IdFZjGwkx88dDSpwWZj2D5t3PyXPIwDsY1Q=", "narHash": "sha256-ILwecHZ1BN6GhZAUB6/UwiN/rZ8gHndKON6DUhidtxI=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "14b35093ca68bf2c81bbc90aace5007142b40b40", "rev": "0afb5e98488aed7017b9bf321b575d0177feb7ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "rpi-5.15.y", "ref": "1.20230405",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }
}, },
"rpi-linux-5_15_87-src": {
"flake": false,
"locked": {
"lastModified": 1673628667,
"narHash": "sha256-hNLVfhalmRhhRfvu2mR/qDmmGl//Ic1eqR7N1HFj2CY=",
"owner": "raspberrypi",
"repo": "linux",
"rev": "da4c8e0ffe7a868b989211045657d600be3046a1",
"type": "github"
},
"original": {
"owner": "raspberrypi",
"repo": "linux",
"rev": "da4c8e0ffe7a868b989211045657d600be3046a1",
"type": "github"
}
},
"u-boot-src": { "u-boot-src": {
"flake": false, "flake": false,
"locked": { "locked": {

10
flake.nix
View file

@ -6,13 +6,13 @@
flake = false; flake = false;
url = "https://ftp.denx.de/pub/u-boot/u-boot-2023.01.tar.bz2"; url = "https://ftp.denx.de/pub/u-boot/u-boot-2023.01.tar.bz2";
}; };
rpi-linux-5_15-src = { rpi-linux-6_1-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/rpi-5.15.y"; url = "github:raspberrypi/linux/1.20230405";
}; };
rpi-firmware-stable-src = { rpi-firmware-src = {
flake = false; flake = false;
url = "github:raspberrypi/firmware/stable"; url = "github:raspberrypi/firmware/1.20230405";
}; };
rpi-firmware-nonfree-src = { rpi-firmware-nonfree-src = {
flake = false; flake = false;
@ -24,7 +24,7 @@
}; };
libcamera-apps-src = { libcamera-apps-src = {
flake = false; flake = false;
url = "github:raspberrypi/libcamera-apps/v1.1.1"; url = "github:raspberrypi/libcamera-apps/v1.1.2";
}; };
}; };

49
overlay/default.nix
View file

@ -1,9 +1,14 @@
{ u-boot-src, rpi-linux-5_15-src, rpi-firmware-stable-src { u-boot-src
, rpi-firmware-nonfree-src, rpi-bluez-firmware-src, libcamera-apps-src }: , rpi-linux-6_1-src
, rpi-firmware-src
, rpi-firmware-nonfree-src
, rpi-bluez-firmware-src
, libcamera-apps-src
}:
final: prev: final: prev:
let let
# The version to stick at `pkgs.rpi-kernels.latest' # The version to stick at `pkgs.rpi-kernels.latest'
latest = "v5_15_92"; latest = "v6_1_21";
# Helpers for building the `pkgs.rpi-kernels' map. # 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 }:
@ -18,7 +23,8 @@ let
new-fw = prev.raspberrypifw.overrideAttrs (oldfw: { src = fw; }); new-fw = prev.raspberrypifw.overrideAttrs (oldfw: { src = fw; });
new-wireless-fw = final.callPackage wireless-fw { }; new-wireless-fw = final.callPackage wireless-fw { };
version-slug = builtins.replaceStrings [ "." ] [ "_" ] version; version-slug = builtins.replaceStrings [ "." ] [ "_" ] version;
in { in
{
"v${version-slug}" = { "v${version-slug}" = {
kernel = new-kernel; kernel = new-kernel;
firmware = new-fw; firmware = new-fw;
@ -26,11 +32,8 @@ let
}; };
}; };
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { }; rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
in { in
{
# disable firmware compression so that brcm firmware can be found at
# the path expected by raspberry pi firmware/device tree
compressFirmwareXz = x: x;
# A recent known working version of libcamera-apps # A recent known working version of libcamera-apps
libcamera-apps = libcamera-apps =
@ -69,13 +72,35 @@ in {
# #
# For example: `pkgs.rpi-kernels.v5_15_87.kernel' # For example: `pkgs.rpi-kernels.v5_15_87.kernel'
rpi-kernels = rpi-kernels [{ rpi-kernels = rpi-kernels [{
version = "5.15.92"; version = "6.1.21";
kernel = rpi-linux-5_15-src; kernel = rpi-linux-6_1-src;
fw = rpi-firmware-stable-src; fw = rpi-firmware-src;
wireless-fw = import ./raspberrypi-wireless-firmware.nix { wireless-fw = import ./raspberrypi-wireless-firmware.nix {
bluez-firmware = rpi-bluez-firmware-src; bluez-firmware = rpi-bluez-firmware-src;
firmware-nonfree = rpi-firmware-nonfree-src; firmware-nonfree = rpi-firmware-nonfree-src;
}; };
argsOverride = {
structuredExtraConfig = with prev.lib.kernel; {
# The perl script to generate kernel options sets unspecified
# parameters to `m` if possible [1]. This results in the
# unspecified config option KUNIT [2] getting set to `m` which
# causes DRM_VC4_KUNIT_TEST [3] to get set to `y`.
#
# This vc4 unit test fails on boot due to a null pointer
# exception with the existing config. I'm not sure why, but in
# any case, the DRM_VC4_KUNIT_TEST config option itself states
# that it is only useful for kernel developers working on the
# vc4 driver. So, I feel no need to deviate from the standard
# rpi kernel and attempt to successfully enable this test and
# other unit tests because the nixos perl script has this
# sloppy "default to m" behavior. So, I set KUNIT to `n`.
#
# [1] https://github.com/NixOS/nixpkgs/blob/85bcb95aa83be667e562e781e9d186c57a07d757/pkgs/os-specific/linux/kernel/generate-config.pl#L1-L10
# [2] https://github.com/raspberrypi/linux/blob/1.20230405/lib/kunit/Kconfig#L5-L14
# [3] https://github.com/raspberrypi/linux/blob/bb63dc31e48948bc2649357758c7a152210109c4/drivers/gpu/drm/vc4/Kconfig#L38-L52
KUNIT = no;
};
};
}] // { }] // {
latest = final.rpi-kernels."${latest}"; latest = final.rpi-kernels."${latest}";
}; };

2
overlay/libcamera-apps.nix
View file

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcamera-apps"; pname = "libcamera-apps";
version = "v1.1.0"; version = "v1.1.2";
src = libcamera-apps-src; src = libcamera-apps-src;

3
rpi/default.nix
View file

@ -8,7 +8,8 @@
"raspberry-pi-firmware-migrate" = { "raspberry-pi-firmware-migrate" = {
description = "update the firmware partition"; description = "update the firmware partition";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = let firmware-path = "/boot/firmware"; serviceConfig =
let firmware-path = "/boot/firmware";
in { in {
Type = "oneshot"; Type = "oneshot";
MountImages = MountImages =