From ef492c5710533bfb2e0648288921b897350689fc Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 7 Jul 2022 17:48:47 +0800
Subject: [PATCH] rpi: hardware patch for fan

---
 nixops/device-tree-module.nix | 67 -----------------------------------
 nixops/device-tree-pkg.nix    | 17 ---------
 nixops/rpi-server.nix         | 12 -------
 nixops/rpi.nix                | 12 -------
 4 files changed, 108 deletions(-)
 delete mode 100644 nixops/device-tree-module.nix
 delete mode 100644 nixops/device-tree-pkg.nix

diff --git a/nixops/device-tree-module.nix b/nixops/device-tree-module.nix
deleted file mode 100644
index b3f1dda..0000000
--- a/nixops/device-tree-module.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.hardware.deviceTree;
-in {
-  options = {
-      hardware.deviceTree = {
-        enable = mkOption {
-          default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false;
-          type = types.bool;
-          description = ''
-            Build device tree files. These are used to describe the
-            non-discoverable hardware of a system.
-          '';
-        };
-
-        base = mkOption {
-          default = "${config.boot.kernelPackages.kernel}/dtbs";
-          defaultText = "\${config.boot.kernelPackages.kernel}/dtbs";
-          example = literalExample "pkgs.device-tree_rpi";
-          type = types.path;
-          description = ''
-            The path containing the base device-tree (.dtb) to boot. Contains
-            device trees bundled with the Linux kernel by default.
-          '';
-        };
-
-        name = mkOption {
-          default = null;
-          example = "some-dtb.dtb";
-          type = types.nullOr types.str;
-          description = ''
-            The name of an explicit dtb to be loaded, relative to the dtb base.
-            Useful in extlinux scenarios if the bootloader doesn't pick the
-            right .dtb file from FDTDIR.
-          '';
-        };
-
-        overlays = mkOption {
-          default = [];
-          example = literalExample
-            "[\"\${pkgs.device-tree_rpi.overlays}/w1-gpio.dtbo\"]";
-          type = types.listOf types.path;
-          description = ''
-            A path containing device tree overlays (.dtbo) to be applied to all
-            base device-trees.
-          '';
-        };
-
-        package = mkOption {
-          default = null;
-          type = types.nullOr types.path;
-          internal = true;
-          description = ''
-            A path containing the result of applying `overlays` to `base`.
-          '';
-        };
-      };
-  };
-
-  config = mkIf (cfg.enable) {
-    hardware.deviceTree.package = if (cfg.overlays != [])
-      then pkgs.deviceTree.applyOverlays cfg.base cfg.overlays else cfg.base;
-  };
-}
diff --git a/nixops/device-tree-pkg.nix b/nixops/device-tree-pkg.nix
deleted file mode 100644
index 2cb13f9..0000000
--- a/nixops/device-tree-pkg.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, stdenvNoCC, dtc, findutils }:
-
-with lib; {
-  applyOverlays = (base: overlays: stdenvNoCC.mkDerivation {
-    name = "device-tree-overlays";
-    nativeBuildInputs = [ dtc findutils ];
-    buildCommand = let
-      quotedDtbos = concatMapStringsSep " " (o: "\"${toString o}\"") (toList overlays);
-    in ''
-      for dtb in $(find ${base} -name "*.dtb" ); do
-        outDtb=$out/$(realpath --relative-to "${base}" "$dtb")
-        mkdir -p "$(dirname "$outDtb")"
-        fdtoverlay -o "$outDtb" -i "$dtb" ${quotedDtbos};
-      done
-    '';
-  });
-}
diff --git a/nixops/rpi-server.nix b/nixops/rpi-server.nix
index edfed2b..b6e6751 100644
--- a/nixops/rpi-server.nix
+++ b/nixops/rpi-server.nix
@@ -11,20 +11,8 @@
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
   boot.kernelParams = ["cma=64M"]; # work around https://github.com/raspberrypi/linux/issues/3208
-  boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3;
   boot.initrd.includeDefaultModules = false;
 
-  # work around https://github.com/NixOS/nixpkgs/issues/125354
-  disabledModules = [ "hardware/device-tree.nix" ];
-  imports = [ ./device-tree-module.nix ];
-  nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
-    deviceTree = super.callPackage ./device-tree-pkg.nix {};
-  };
-  hardware.deviceTree.enable = true;
-  hardware.deviceTree.base = pkgs.device-tree_rpi;
-  hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ];
-
-
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/NIXOS_SD";
diff --git a/nixops/rpi.nix b/nixops/rpi.nix
index c86b0c2..680a753 100644
--- a/nixops/rpi.nix
+++ b/nixops/rpi.nix
@@ -14,20 +14,8 @@ in
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
   boot.kernelParams = if rpi4 then ["cma=64M"] else []; # work around https://github.com/raspberrypi/linux/issues/3208
-  boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3;
   boot.initrd.includeDefaultModules = false;
 
-  # work around https://github.com/NixOS/nixpkgs/issues/125354
-  disabledModules = [ "hardware/device-tree.nix" ];
-  imports = [ ./device-tree-module.nix ];
-  nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
-    deviceTree = super.callPackage ./device-tree-pkg.nix {};
-  };
-  hardware.deviceTree.enable = true;
-  hardware.deviceTree.base = pkgs.device-tree_rpi;
-  hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ];
-
-
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/NIXOS_SD";