mirror of
https://github.com/nix-community/raspberry-pi-nix.git
synced 2025-11-08 11:36:04 +01:00
set default kernel
This commit is contained in:
parent
9cac87a79c
commit
defb166e1e
5 changed files with 11 additions and 39 deletions
|
|
@ -22,6 +22,9 @@ let
|
|||
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
|
||||
in {
|
||||
|
||||
# disable firmware compression so that brcm firmware can be found at
|
||||
# the path expected by raspberry pi firmware/device tree
|
||||
compressFirmwareXz = x: x;
|
||||
libcamera-apps = final.callPackage ./libcamera-apps.nix { };
|
||||
|
||||
# provide generic rpi arm64 u-boot
|
||||
|
|
@ -35,6 +38,8 @@ in {
|
|||
sha256 = "0png7p8k6rwbmmcyhc22xczcaz7kx0dafw5zmp0i9ni4kjs8xc4j";
|
||||
};
|
||||
};
|
||||
raspberrypiWirelessFirmware = final.rpi-kernels.v5_15_87.wireless-firmware;
|
||||
raspberrypifw = final.rpi-kernels.v5_15_87.firmware;
|
||||
|
||||
# raspberrypiWirelessFirmware = prev.raspberrypiWirelessFirmware.overrideAttrs
|
||||
# (old: {
|
||||
|
|
|
|||
|
|
@ -3,22 +3,10 @@ rpi:
|
|||
|
||||
{
|
||||
imports = [ rpi ];
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
raspberrypiWirelessFirmware =
|
||||
final.rpi-kernels.v5_15_87.wireless-firmware;
|
||||
raspberrypifw = final.rpi-kernels.v5_15_87.firmware;
|
||||
})
|
||||
];
|
||||
};
|
||||
boot.kernelPackages =
|
||||
pkgs.linuxPackagesFor (pkgs.rpi-kernels.v5_15_87.kernel);
|
||||
hardware.raspberry-pi.deviceTree = {
|
||||
base-dtb = "bcm2710-rpi-3-b-plus.dtb";
|
||||
# u-boot expects bcm2837-rpi-3-b-plus.dtb for the 3b+ (as of
|
||||
# 2020.04), although the kernel has 2710. We rename it to satisfy
|
||||
# u-boot for now.
|
||||
# u-boot expects bcm2837-rpi-3-b-plus.dtb for the 3b+ Rename the
|
||||
# raspberry pi dtb to match mainline linux and satisfy u-boot.
|
||||
postInstall = ''
|
||||
mv $out/broadcom/bcm2710-rpi-3-b-plus.dtb $out/broadcom/bcm2837-rpi-3-b-plus.dtb
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,18 +2,7 @@ rpi:
|
|||
{ lib, pkgs, config, ... }:
|
||||
|
||||
{
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
raspberrypiWirelessFirmware =
|
||||
final.rpi-kernels.v5_15_87.wireless-firmware;
|
||||
raspberrypifw = final.rpi-kernels.v5_15_87.firmware;
|
||||
})
|
||||
];
|
||||
};
|
||||
imports = [ rpi ];
|
||||
hardware.raspberry-pi.deviceTree.base-dtb = "bcm2711-rpi-4-b.dtb";
|
||||
boot.kernelPackages =
|
||||
pkgs.linuxPackagesFor (pkgs.rpi-kernels.v5_15_87.kernel);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,22 +3,11 @@ rpi:
|
|||
|
||||
{
|
||||
imports = [ rpi ];
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
raspberrypiWirelessFirmware =
|
||||
final.rpi-kernels.v5_15_36.wireless-firmware;
|
||||
raspberrypifw = final.rpi-kernels.v5_15_36.firmware;
|
||||
})
|
||||
];
|
||||
};
|
||||
hardware.raspberry-pi.deviceTree.base-dtb = "bcm2710-rpi-zero-2.dtb";
|
||||
# u-boot expects bcm2837-rpi-zero-2.dtb for the zero 2 w (as of
|
||||
# 2020.04), although the kernel has 2710. We rename it to satisfy
|
||||
# u-boot for now.
|
||||
# u-boot expects bcm2837-rpi-zero-2.dtb for the zero 2 w (this is
|
||||
# the device tree name in the upstream kernel), Rename the raspberry
|
||||
# pi dtb to the expected name to satisfy u-boot.
|
||||
hardware.raspberry-pi.deviceTree.postInstall = ''
|
||||
mv $out/broadcom/bcm2710-rpi-zero-2.dtb $out/broadcom/bcm2837-rpi-zero-2.dtb
|
||||
'';
|
||||
boot.kernelPackages =
|
||||
pkgs.linuxPackagesFor (pkgs.rpi-kernels.v5_15_36.kernel);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
nixpkgs = { overlays = [ overlay ]; };
|
||||
boot = {
|
||||
initrd.availableKernelModules = [ "usbhid" "usb_storage" "vc4" ];
|
||||
kernelPackages = pkgs.linuxPackagesFor (pkgs.rpi-kernels.v5_15_87.kernel);
|
||||
|
||||
loader = {
|
||||
grub.enable = lib.mkDefault false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue