Merge 2107941ba2 into 52113c4f5c

Rename some modules to their correct names

README.md

@@ -210,6 +210,7 @@ See code for all available configurations.
 | [Framework 16 AMD Ryzen AI 300 Series](framework/16-inch/amd-ai-300-series)       | `<nixos-hardware/framework/16-inch/amd-ai-300-series>`  | `framework-16-amd-ai-300-series`       |
 | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4)                                    | `<nixos-hardware/friendlyarm/nanopc-t4>`                | `friendlyarm-nanopc-t4`                |
 | [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s)                                  | `<nixos-hardware/friendlyarm/nanopi-r5s>`               | `friendlyarm-nanopi-r5s`               |
+| [FriendlyARM CM3588 NAS](friendlyarm/cm3588-nas)                                  | `<nixos-hardware/friendlyarm/cm3588-nas>`               | `friendlyarm-cm3588-nas`               |
 | [Focus M2 Gen 1](focus/m2/gen1)                                                   | `<nixos-hardware/focus/m2/gen1>`                        | `focus-m2-gen1`                        |
 | [Fydetab Duo](fydetab/duo)                                                        | `<nixos-hardware/fydetab/duo>`                          | `fydetab-duo`                          |
 | [Gigabyte B550](gigabyte/b550)                                                    | `<nixos-hardware/gigabyte/b550>`                        | `gigabyte-b550`                        |

dell/precision/7520/default.nix

@@ -15,7 +15,7 @@
   boot.initrd.availableKernelModules = [
     "xhci_pci"
     "ahci"
-    "usb_storage"
+    "usb-storage"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];

flake.nix

@@ -176,6 +176,7 @@
           framework-desktop-amd-ai-max-300-series = import ./framework/desktop/amd-ai-max-300-series;
           friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4;
           friendlyarm-nanopi-r5s = import ./friendlyarm/nanopi-r5s;
+          friendlyarm-cm3588-nas = import ./friendlyarm/cm3588-nas;
           focus-m2-gen1 = import ./focus/m2/gen1;
           fydetab-duo = import ./fydetab/duo;
           gigabyte-b550 = import ./gigabyte/b550;

focus/m2/gen1/default.nix

@@ -13,7 +13,7 @@
     "xhci_pci"
     "ahci"
     "nvme"
-    "usb_storage"
+    "usb-storage"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];

friendlyarm/cm3588-nas/default.nix

@@ -0,0 +1,75 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
+  imports = [
+    ../../rockchip
+  ];
+
+  config = {
+    hardware = {
+      rockchip = {
+        rk3588.enable = true;
+        platformFirmware = lib.mkDefault pkgs.ubootCM3588NAS;
+      };
+
+      deviceTree.name = lib.mkDefault "rockchip/rk3588-friendlyelec-cm3588-nas.dtb";
+    };
+
+    boot = {
+      initrd.kernelModules = [
+        "nvme"
+
+        # PCI
+        "pcie_rockchip_host"
+        "phy_rockchip_naneng_combphy"
+        "phy_rockchip_pcie"
+
+        # USB
+        "tcpm"
+        "typec"
+        "thunderbolt"
+        "fusb302"
+
+        # Networking
+        "r8169"
+
+        # Graphics
+        "analogix_dp"
+        "cec"
+        "drm_display_helper"
+        "drm_dma_helper"
+        "drm_dp_aux_bus"
+        "drm_exec"
+        "drm_gpuvm"
+        "dw_hdmi_qp"
+        "dw_hdmi"
+        "dw_mipi_dsi"
+        "gpu_sched"
+        "panthor"
+        "phy_rockchip_samsung_hdptx"
+        "phy_rockchip_usbdp"
+        "rockchipdrm"
+
+        # Misc
+        "rk805_pwrkey"
+        "rockchip_dfi"
+        "rockchip_rga"
+        "rockchip_saradc"
+        "rockchip_thermal"
+        "rtc_hym8563"
+      ];
+
+      kernelParams = [
+        "earlycon"
+        "rootwait"
+        "splash"
+        "console=tty1"
+        "consoleblank=0"
+      ];
+    };
+  };
+}

purism/librem/5r4/initrd.nix

@@ -14,7 +14,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
       "tps6598x"
       "xhci_hcd"
       "usbcore"
-      "usb_storage"
+      "usb-storage"
       "uas"
       "xhci_plat_hcd"
     ];
@@ -56,7 +56,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
       "tps6598x"
       "xhci_hcd"
       "usbcore"
-      "usb_storage"
+      "usb-storage"
       "uas"
       "xhci_plat_hcd"
     ];

raspberry-pi/3/default.nix

@@ -9,7 +9,7 @@
     kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
     initrd.availableKernelModules = [
       "usbhid"
-      "usb_storage"
+      "usb-storage"
     ];
   };
 

raspberry-pi/4/default.nix

@@ -31,9 +31,9 @@
     kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4;
     initrd.availableKernelModules = [
       "usbhid"
-      "usb_storage"
+      "usb-storage"
       "vc4"
-      "pcie_brcmstb" # required for the pcie bus to work
+      "pcie-brcmstb" # required for the pcie bus to work
       "reset-raspberrypi" # required for vl805 firmware to load
     ]
     ++ lib.optional config.boot.initrd.network.enable "genet";

raspberry-pi/5/default.nix

@@ -16,7 +16,7 @@ in
     initrd.availableKernelModules = [
       "nvme"
       "usbhid"
-      "usb_storage"
+      "usb-storage"
     ];
   };