From 438631e4013b074f83cc812d2fe8aa5dfcba473e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 5 Apr 2018 23:35:18 +0200 Subject: [PATCH] kernelPatches: Adds bcm2835_mmal_v4l2_camera_driver The kernel patch is required for raspberry pi, to enable the camera module. [dezgeg: Add some comments indicating it's only needed for 4.16] --- pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e163459d7f4..cedb2dfc223 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -73,4 +73,15 @@ rec { }; }; + # https://patchwork.kernel.org/patch/9626797/ + # Should be included in 4.17, so this patch can be dropped when 4.16 becomes obsolete. + bcm2835_mmal_v4l2_camera_driver = rec { + name = "bcm2835_mmal_v4l2_camera_driver"; + patch = fetchpatch { + name = name + ".patch"; + url = https://patchwork.kernel.org/patch/9626797/raw/; + sha256 = "0iwb0yxsf95zv4qxkvlvhqfmzx0rk13g9clvxsharvwkb4w5lwa0"; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1dca539922..0ab695cd586 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13354,6 +13354,7 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu