bcachefs rootfs on helios64

machines/storage/s0/helios64/default.nix

@@ -9,17 +9,18 @@
 
   boot.kernelParams = lib.mkAfter [
     "console=ttyS2,115200n8"
-    "earlyprintk"
     "earlycon=uart8250,mmio32,0xff1a0000"
   ];
 
-  # disabled because, when enabled, bcachefs wants a different but still adequate kernel
-  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_16;
+  # Required for rootfs on sata
+  boot.initrd.availableKernelModules = [
+    "pcie-rockchip-host"
+    "phy-rockchip-pcie"
+    "phy-rockchip-usb"
+  ];
 
-  # bcachefs kernel is 5.15. but need a patch that is only in 5.16
+  # bcachefs kernel is 5.15. but need patches that are only in 5.16+
   # Patch the device tree to add support for getting the cpu thermal temp
   hardware.deviceTree.enable = true;
-  hardware.deviceTree.overlays = [
-    ./helios64-cpu-temp.dtbo
-  ];
+  hardware.deviceTree.kernelPackage = pkgs.linux_latest;
 }

machines/storage/s0/helios64/helios64-cpu-temp.dts

@@ -1,17 +0,0 @@
-/* rk3399-kobol-helios64.dts */
-
-/dts-v1/;
-/ {
-    model = "Kobol Helios64";
-	compatible = "kobol,helios64\0rockchip,rk3399";
-	fragment@0 {
-		target-path = "/";
-		__overlay__ {
-			tsadc@ff260000 {
-				status = "okay";
-				rockchip,hw-tshut-mode = <0x01>;
-				rockchip,hw-tshut-polarity = <0x01>;
-			};
-		};
-	};
-};