min-copy-closure use rsync instead of rogue as demo package

this is to fix the CI job - because rsync builds and rogue presently doesn't

CODE-OF-CONDUCT.md

@@ -1,57 +0,0 @@
-# Liminix community spaces Code of Conduct
-
-As of Feb 2023, "RESPONSE TEAM" and "LEADERSHIP TEAM" in the text that follows
-both refer to me, Daniel Barlow, as there are not yet any other project members.
-
-Liminix is dedicated to providing a harassment-free experience for everyone. We do not tolerate harassment of participants in any form.
-
-This code of conduct applies to all Liminix spaces, including the IRC channel, mailing lists, and Github forums, both online and off. Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the discretion of the RESPONSE TEAM.
-
-Some Liminix spaces may have additional rules in place, which will be made clearly available to participants. Participants are responsible for knowing and abiding by these rules.
-
-Harassment includes:
-
-*Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, neuro(a)typicality, physical appearance, body size, age, race, or religion.
-*Unwelcome comments regarding a person’s lifestyle choices and practices, including those related to food, health, parenting, drugs, and employment.
-*Deliberate misgendering or use of ‘dead’ or rejected names.
-*Gratuitous or off-topic sexual images or behaviour in spaces where they’re not appropriate.
-*Physical contact and simulated physical contact (eg, textual descriptions like “*hug*” or “*backrub*”) without consent or after a request to stop.
-*Threats of violence.
-*Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
-*Deliberate intimidation.
-*Stalking or following.
-*Harassing photography or recording, including logging online activity for harassment purposes.
-*Sustained disruption of discussion.
-*Unwelcome sexual attention.
-*Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others
-*Continued one-on-one communication after requests to cease.
-*Deliberate “outing” of any aspect of a person’s identity without their consent except as necessary to protect vulnerable people from intentional abuse.
-*Publication of non-harassing private communication.
-Liminix prioritizes marginalized people’s safety over privileged people’s comfort. RESPONSE TEAM reserves the right not to act on complaints regarding:
-*‘Reverse’ -isms, including ‘reverse racism,’ ‘reverse sexism,’ and ‘cisphobia’
-*Reasonable communication of boundaries, such as “leave me alone,” “go away,” or “I’m not discussing this with you.”
-*Communicating in a ‘tone’ you don’t find congenial
-*Criticizing racist, sexist, cissexist, or otherwise oppressive behavior or assumptions
-
-## Reporting
-
-If you are being harassed by a member of Liminix, notice that someone else is being harassed, or have any other concerns, please contact the RESPONSE TEAM at [email address or other contact point]. If the person who is harassing you is on the team, they will recuse themselves from handling your incident. We will respond as promptly as we can.
-
-This code of conduct applies to Liminix spaces, but if you are being harassed by a member of Liminix outside our spaces, we still want to know about it. We will take all good-faith reports of harassment by Liminix members, especially LEADERSHIP TEAM, seriously. This includes harassment outside our spaces and harassment that took place at any point in time. The abuse team reserves the right to exclude people from Liminix based on their past behavior, including behavior outside Liminix spaces and behavior towards people who are not in Liminix.
-
-In order to protect volunteers from abuse and burnout, we reserve the right to reject any report we believe to have been made in bad faith. Reports intended to silence legitimate criticism may be deleted without response.
-
-We will respect confidentiality requests for the purpose of protecting victims of abuse. At our discretion, we may publicly name a person about whom we’ve received harassment complaints, or privately warn third parties about them, if we believe that doing so will increase the safety of Liminix members or the general public. We will not name harassment victims without their affirmative consent.
-
-### Consequences
-
-Participants asked to stop any harassing behavior are expected to comply immediately.
-
-If a participant engages in harassing behavior, RESPONSE TEAM may take any action they deem appropriate, up to and including expulsion from all Liminix spaces and identification of the participant as a harasser to other Liminix members or the general public.
-
-## License and attribution
-
-The policy is based on the Geek Feminism
-[Community anti-harassment/Policy](https://geekfeminism.fandom.com/wiki/Community_anti-harassment/Policy)
-and is the work of Annalee Flower Horne with assistance from Valerie
-Aurora, Alex Skud Bayley, Tim Chevalier, and Mary Gardiner.

NEWS

@@ -103,3 +103,69 @@ a bit more useful :-)
       };
     })
   ];
+
+2024-07-16
+
+* structured parameters are available for the pppoe service
+
+* The "wan" configuration in modules/profiles/gateway.nix has changed:
+instead of passing options that are used to create a pppoe interface,
+callers should create a (pppoe or other) interface and pass that as
+the value of profile.gateway.wan. For the pppoe case this is now only
+very slightly more verbose, and it allows using the gateway profile
+with other kinds of upstream.
+
+2024-8-16
+
+As part of implementing log shipping, the default directory for system
+logs has beenchanged from /run/uncaught-logs to /run/log
+
+2024-10-09
+
+liminix-rebuild is being deprecated. From hereon in, the preferred way
+to do an incremental update on an installed device with a writable
+filesystem is to build the systemConfiguration output
+
+    nix-build  -I liminix-config=hosts/myhost.nix --argstr deviceName turris-omnia -A outputs.systemConfiguration 
+
+and then run the generated `install.sh` script
+
+    result/install.sh root@192.168.8.1
+
+2024-12-16
+
+Config options changed: if you had set config.hardware.dts.includes
+(maybe in an out-of-tree device port) to specify the search paths
+in which dtc finds include files, you will need to change this to 
+hardware.dts.includePaths.
+
+The "new" hardware.dts.includes option is now for dtsi files which
+should be merged into the device tree.
+
+2024-12-19
+
+Incremental updates changed again (but not massively). From hereon in,
+the preferred way to do an incremental update on an installed device
+with a writable filesystem is to build the updater output
+
+    nix-build  -I liminix-config=hosts/myhost.nix --argstr deviceName turris-omnia -A outputs.updater
+
+and then run the generated `update.sh` script. See 
+https://www.liminix.org/doc/admin.html#updating-an-installed-system
+
+2024-12-22
+
+outputs.zimage is now outputs.kernel.zImage. This is unlikely to
+affect many people at all but I mention it anyway.
+
+2024-03-11
+
+The fennel function (svc.open ...) now expects to be given the store
+directory of a service derivation, not a direct path to the .outputs
+directory. Thus
+
+(svc.open "/nix/store/eeeeeeeeeeeeee-hellod")
+not
+(svc.open "/nix/store/eeeeeeeeeeeeee-hellod/.outputs")
+
+This simplifies most extant uses of it

boot.expect

@@ -0,0 +1,42 @@
+# This is for use with minicom, but needs you to configure it to
+# use expect as its "Script program" instead of runscript.  Try
+# Ctrl+A O -> Filenames and paths -> D
+
+fconfigure stderr -buffering  none
+fconfigure stdout -buffering  none
+
+proc waitprompt { } {
+    expect {
+      "BusyBox" { puts stderr  "DONE\r"; exit 0 }
+      "READY" { puts stderr ";;; READY\r"; }
+      timeout { puts stderr ";;; timed out waiting after $line\r" }
+    }
+}
+
+proc sendline { line } {
+     send "$line; echo \$ready \r"
+     sleep 0.1
+}
+
+log_user 0
+log_file -a -open stderr
+
+set f [open "result/boot.scr"]
+
+send "setenv ready REA\r"
+sleep 0.1
+send "setenv ready \${ready}DY\r"
+sleep 0.1
+
+set timeout 300
+expect_before timeout abort
+while {[gets $f line] >= 0} {
+    puts stderr ";;; next line $line\r"
+    puts stderr ";;; waiting for prompt\r"
+    puts stderr ";;; sending\r"	
+    sendline $line
+    waitprompt
+}
+
+puts stderr "done\r\n"
+close $f

bordervm-configuration.nix

@@ -1,12 +1,25 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.bordervm;
-  inherit (lib) mkOption mkEnableOption mdDoc types optional optionals;
-in {
+  inherit (lib)
+    mkOption
+    mkEnableOption
+    mdDoc
+    types
+    optional
+    optionals
+    ;
+in
+{
   options.bordervm = {
     keys = mkOption {
       type = types.listOf types.str;
-      default = [];
+      default = [ ];
     };
     l2tp = {
       host = mkOption {
@@ -55,18 +68,17 @@ in {
     <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>
   ];
   config = {
-    boot.kernelParams = [
-      "loglevel=9"
-    ];
+    boot.kernelParams = [ "loglevel=9" ];
     systemd.services.pppoe =
-      let conf = pkgs.writeText "kpppoed.toml"
-        ''
-      interface_name = "eth1"
-      services = [ "myservice" ]
-      lns_ipaddr = "${cfg.l2tp.host}:${builtins.toString cfg.l2tp.port}"
-      ac_name = "kpppoed-1.0"
-    '';
-      in  {
+      let
+        conf = pkgs.writeText "kpppoed.toml" ''
+          interface_name = "eth1"
+          services = [ "myservice" ]
+          lns_ipaddr = "${cfg.l2tp.host}:${builtins.toString cfg.l2tp.port}"
+          ac_name = "kpppoed-1.0"
+        '';
+      in
+      {
         wantedBy = [ "multi-user.target" ];
         after = [ "network-online.target" ];
         serviceConfig = {
@@ -80,53 +92,113 @@ in {
       };
     };
     services.openssh.enable = true;
+    services.dnsmasq = {
+      enable = true;
+      resolveLocalQueries = false;
+      settings = {
+        # domain-needed = true;
+        dhcp-range = [ "10.0.0.10,10.0.0.240" ];
+        interface = "eth1";
+      };
+    };
+
+    services.nginx = {
+      enable = true;
+      user = "liminix";
+      virtualHosts.${config.networking.hostName} = {
+        root = "/home/liminix";
+        default = true;
+      };
+    };
+    systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
+
     systemd.services.sshd.wantedBy = pkgs.lib.mkForce [ "multi-user.target" ];
 
     virtualisation = {
+      forwardPorts = [
+        {
+          from = "host";
+          host.port = 7654;
+          #        guest.address = "10.0.2.15";
+          guest.port = 7654;
+        }
+        {
+          host.port = 2222;
+          guest.address = "10.0.2.15";
+          guest.port = 22;
+        }
+      ];
       qemu = {
-        networkingOptions = [];
-        options = [] ++
-          optional cfg.ethernet.pci.enable
-            "-device vfio-pci,host=${cfg.ethernet.pci.id}" ++
-          optionals cfg.ethernet.usb.enable [
+        networkingOptions = [ ];
+        options =
+          [ ]
+          ++ optional cfg.ethernet.pci.enable "-device vfio-pci,host=${cfg.ethernet.pci.id}"
+          ++ optionals cfg.ethernet.usb.enable [
             "-device usb-ehci,id=ehci"
             "-device usb-host,bus=ehci.0,vendorid=${cfg.ethernet.usb.vendor},productid=${cfg.ethernet.usb.product}"
-          ] ++ [
+          ]
+          ++ [
             "-nographic"
             "-serial mon:stdio"
           ];
       };
       sharedDirectories = {
         liminix = {
+          securityModel = "none";
           source = builtins.toString ./.;
           target = "/home/liminix/liminix";
         };
       };
     };
+
+    services.tang = {
+      enable = true;
+      ipAddressAllow = [
+        "10.0.0.0/24"
+        "0.0.0.0/0"
+      ];
+    };
+
     environment.systemPackages =
-      let wireshark-nogui = pkgs.wireshark.override { withQt = false ; };
-          in with pkgs; [
-            tcpdump
-            wireshark-nogui
-            socat
-            tufted
-            iptables
-            usbutils
-            busybox
-          ];
+      let
+        wireshark-nogui = pkgs.wireshark.override { withQt = false; };
+      in
+      with pkgs;
+      [
+        tcpdump
+        wireshark-nogui
+        socat
+        tufted
+        iptables
+        usbutils
+        busybox
+        clevis
+      ];
     security.sudo.wheelNeedsPassword = false;
     networking = {
       hostName = "border";
-      firewall = { enable = false; };
+      firewall = {
+        enable = false;
+      };
       interfaces.eth1 = {
         useDHCP = false;
-        ipv4.addresses = [ { address = "10.0.0.1"; prefixLength = 24;}];
+        ipv4.addresses = [
+          {
+            address = "10.0.0.1";
+            prefixLength = 24;
+          }
+        ];
+      };
+      nat = {
+        enable = true;
+        internalInterfaces = [ "eth1" ];
+        externalInterface = "eth0";
       };
     };
     users.users.liminix = {
       isNormalUser = true;
       uid = 1000;
-      extraGroups = [ "wheel"];
+      extraGroups = [ "wheel" ];
       openssh.authorizedKeys.keys = cfg.keys;
     };
     services.getty.autologinUser = "liminix";

bordervm.conf-example.nix

@@ -1,8 +1,12 @@
-{...}:
+{ ... }:
 {
   bordervm = {
     # ethernet.pci = { id = "01:00.0"; enable = true; };
-    ethernet.usb = { vendor = "0x0bda"; product = "0x8153"; enable = true; };
+    ethernet.usb = {
+      vendor = "0x0bda";
+      product = "0x8153";
+      enable = true;
+    };
     l2tp = {
       host = "l2tp.aa.net.uk";
     };

ci.nix

@@ -1,12 +1,7 @@
-{
-  nixpkgs
-, unstable
-, liminix
-, ... }:
 let
-  inherit (builtins) map;
-  pkgs = (import nixpkgs {});
-  borderVmConf =  ./bordervm.conf-example.nix;
+  pkgs = import <nixpkgs> { };
+  liminix = <liminix>;
+  borderVmConf = ./bordervm.conf-example.nix;
   inherit (pkgs.lib.attrsets) genAttrs;
   devices = [
     "gl-ar750"
@@ -16,67 +11,37 @@ let
     "qemu-aarch64"
     "qemu-armv7l"
     "tp-archer-ax23"
+    "openwrt-one"
     "zyxel-nwa50ax"
+    "turris-omnia"
+    "belkin-rt3200"
   ];
   vanilla = ./vanilla-configuration.nix;
-  for-device = name:
+  for-device =
+    name:
     (import liminix {
-      inherit nixpkgs borderVmConf;
+      inherit borderVmConf;
       device = import (liminix + "/devices/${name}");
       liminix-config = vanilla;
     }).outputs.default;
   tests = import ./tests/ci.nix;
   jobs =
-    (genAttrs devices for-device) //
-    tests //
-    {
-      buildEnv = (import liminix {
-        inherit nixpkgs borderVmConf;
-        device = import (liminix + "/devices/qemu");
-        liminix-config = vanilla;
-      }).buildEnv;
-      doc =
-        let json =
-              (import liminix {
-                inherit nixpkgs borderVmConf;
-                device = import (liminix + "/devices/qemu");
-                liminix-config = {...} : {
-                  imports = [ ./modules/all-modules.nix ];
-                };
-              }).outputs.optionsJson;
-            installers = map (f: "system.outputs.${f}") [
-              "vmroot"
-              "mtdimage"
-              "ubimage"
-            ];
-            inherit (pkgs.lib) concatStringsSep;
-        in pkgs.stdenv.mkDerivation {
-          name = "liminix-doc";
-          nativeBuildInputs = with pkgs; [
-            gnumake sphinx fennel luaPackages.lyaml
-          ];
-          src = ./.;
-          buildPhase = ''
-            cat ${json} | fennel --correlate doc/parse-options.fnl > doc/modules-generated.rst
-            cat ${json} | fennel --correlate doc/parse-options-outputs.fnl     > doc/outputs-generated.rst
-            cp ${(import ./doc/hardware.nix)} doc/hardware.rst
-            make -C doc html
-          '';
-          installPhase = ''
-            mkdir -p $out/nix-support $out/share/doc/
-            cd doc
-            cp *-generated.rst  $out
-            ln -s ${json} $out/options.json
-            cp -a _build/html $out/share/doc/liminix
-            echo "file source-dist \"$out/share/doc/liminix\"" \
-                > $out/nix-support/hydra-build-products
-          '';
-      };
-      with-unstable = (import liminix {
-        nixpkgs = unstable;
-        inherit borderVmConf;
-        device = import (liminix + "/devices/qemu");
-        liminix-config = vanilla;
-      }).outputs.default;
+    (genAttrs devices for-device)
+    // tests
+    // {
+      buildEnv =
+        (import liminix {
+          inherit borderVmConf;
+          device = import (liminix + "/devices/qemu");
+          liminix-config = vanilla;
+        }).buildEnv;
+      doc = pkgs.callPackage ./doc.nix { inherit liminix borderVmConf; } ;
     };
-in jobs
+in
+jobs
+// {
+  all = pkgs.mkShell {
+    name = "all tests";
+    contents = pkgs.lib.collect pkgs.lib.isDerivation jobs;
+  };
+}

default.nix

@@ -1,36 +1,45 @@
 {
-  deviceName ? null
-, device ? (import ./devices/${deviceName} )
-, liminix-config ? <liminix-config>
-, nixpkgs ? <nixpkgs>
-, borderVmConf ? ./bordervm.conf.nix
-, imageType ? "primary"
+  deviceName ? null,
+  device ? (import ./devices/${deviceName}),
+  liminix-config ? <liminix-config>,
+  borderVmConf ? ./bordervm.conf.nix,
+  imageType ? "primary",
 }:
 
 let
   overlay = import ./overlay.nix;
-  pkgs = import nixpkgs (device.system // {
-    overlays = [overlay];
-    config = {
-      allowUnsupportedSystem = true; # mipsel
-      permittedInsecurePackages = [
-        "python-2.7.18.6"       # kernel backports needs python <3
-        "python-2.7.18.7"
-      ];
-    };
-  });
+  pkgs = import <nixpkgs> (
+    device.system
+    // {
+      overlays = [ overlay ];
+      config = {
+        allowUnsupportedSystem = true; # mipsel
+        permittedInsecurePackages = [
+          "python-2.7.18.6" # kernel backports needs python <3
+          "python-2.7.18.7"
+        ];
+      };
+    }
+  );
 
   eval = pkgs.lib.evalModules {
     specialArgs = {
       modulesPath = builtins.toString ./modules;
     };
     modules = [
-      { _module.args = { inherit pkgs; inherit (pkgs) lim; }; }
+      {
+        _module.args = {
+          inherit pkgs;
+          inherit (pkgs) lim;
+        };
+      }
       ./modules/hardware.nix
       ./modules/base.nix
       ./modules/busybox.nix
       ./modules/hostname.nix
       ./modules/kernel
+      ./modules/logging.nix
+      ./modules/klogd.nix
       device.module
       liminix-config
       ./modules/s6
@@ -43,23 +52,34 @@ let
   };
   config = eval.config;
 
-  borderVm = ((import <nixpkgs/nixos/lib/eval-config.nix>) {
-    system = builtins.currentSystem;
-    modules = [
-      ({  ... } : { nixpkgs.overlays = [ overlay ]; })
-      (import ./bordervm-configuration.nix)
-      borderVmConf
-    ];
-  }).config.system;
-in {
+  borderVm =
+    ((import <nixpkgs/nixos/lib/eval-config.nix>) {
+      system = builtins.currentSystem;
+      modules = [
+        {
+          nixpkgs.overlays = [
+            (final: prev: {
+              go-l2tp = final.callPackage ./pkgs/go-l2tp { };
+              tufted = final.callPackage ./pkgs/tufted { };
+            })
+          ];
+        }
+        (import ./bordervm-configuration.nix)
+        borderVmConf
+      ];
+    }).config.system;
+in
+{
   outputs = config.system.outputs // {
     default = config.system.outputs.${config.hardware.defaultOutput};
     optionsJson =
-      let o = import ./doc/extract-options.nix {
-            inherit pkgs eval;
-            lib = pkgs.lib;
-          };
-      in pkgs.writeText "options.json" (builtins.toJSON o);
+      let
+        o = import ./doc/extract-options.nix {
+          inherit pkgs eval;
+          lib = pkgs.lib;
+        };
+      in
+      pkgs.writeText "options.json" (builtins.toJSON o);
   };
 
   # this is just here as a convenience, so that we can get a

devices/belkin-rt3200/default.nix

@@ -4,15 +4,8 @@
     ******************************
 
     This device is based on a 64 bit Mediatek MT7622 ARM platform,
-    and is "work in progress" in Liminix.
-
-    .. note:: The factory flash image contains ECC errors that make it
-              incompatible with Liminix: you need to use the `OpenWrt
-              UBI Installer <https://github.com/dangowrt/owrt-ubi-installer>`_ to
-              rewrite the partition layout before you can flash
-              Liminix onto it (or even use it with
-              :ref:`system-outputs-tftpboot`, if you want the wireless
-              to work).
+    and is mostly feature-complete in Liminix but as of Dec 2024
+    has seen very little actual use.
 
     Hardware summary
     ================
@@ -27,10 +20,94 @@
     Installation
     ============
 
-    Installation is currently a manual process (you need a :ref:`serial <serial>` conection and
-    TFTP) following the instructions at :ref:`system-outputs-ubimage`
+    Liminix on this device uses the UBI volume management system to
+    perform wear leveling on the flash. This is not set up from the
+    factory, so a one-time step is needed to prepare it before Liminix
+    can be installed.
 
-'';
+
+    Preparation
+    -----------
+
+    To prepare the device for Liminix you first need to use the
+    `OpenWrt UBI Installer
+    <https://github.com/dangowrt/owrt-ubi-installer>`_ image to
+    rewrite the flash layout. As of Jan 2025 there are two versions
+    of the installer available: the release version 1.0.2 and the
+    pre-release 1.1.3 and for Liminix you nee the pre-relese.
+    The release version of the installer creates UBI volumes
+    according to an older layout that is not compatible with
+    the Linux 6.6.67 kernel used in Liminix.
+
+    You can run the installer in one of two ways:
+    either follow the instructions to do it through the vendor web
+    interface, or you can drop to U-Boot and use TFTP
+
+    .. code-block:: console
+
+        MT7622> setenv ipaddr 10.0.0.6
+        MT7622> setenv serverip 10.0.0.1
+        MT7622> tftpboot 0x42000000  openwrt-mediatek-mt7622-linksys_e8450-ubi-initramfs-recovery-installer.itb
+        MT7622> bootm 0x42000000
+
+    This will write the new flash layout and then boot into a
+    "recovery" OpenWrt installation.
+
+    Building/installing Liminix
+    ----------------
+
+    The default target for this device is ``outputs.ubimage`` which
+    makes a ubifs image suitable for use with :command:`ubiupdatevol`.
+    To write this to the device we use the OpenWrt recovery system
+    installed in the previous step. In this configuration the
+    device assigns itself the IP address 192.168.1.1/24 on its LAN
+    ports and expects the connected computer to have 192.168.1.254
+
+    .. warning:: The `ubi0_7` device in these instructions is correct
+                 as of Dec 2024 (dangowrt/owrt-ubi-installer commit
+                 d79e7928). If you are installing some time later, it
+                 is important to check the output from
+                 :command:`ubinfo -a` and make sure you are updating
+                 the "liminix" volume and not some other one which had
+                 been introduced since I wrote this.
+
+    .. code-block:: console
+
+        $ nix-build -I liminix-config=./my-configuration.nix  --arg device "import ./devices/belkin-rt3200" -A outputs.default
+        $ cat result/rootfs | ssh root@192.168.1.1 "cat > /tmp/rootfs"
+        $ ssh root@192.168.1.1
+        root@OpenWrt:~# ubimkvol /dev/ubi0 --name=liminix --maxavsize
+        root@OpenWrt:~# ubinfo -a
+        [...]
+        Volume ID:   7 (on ubi0)
+        Type:        dynamic
+        Alignment:   1
+        Size:        851 LEBs (108056576 bytes, 103.0 MiB)
+        State:       OK
+        Name:        liminix
+        Character device major/minor: 250:8
+        root@OpenWrt:~# ubiupdatevol /dev/ubi0_7 /tmp/rootfs
+
+    To make the new system bootable we also need to change some U-Boot variables.
+    ``boot_production`` needs to mount the filesystem and boot the FIT image
+    found there, and :code:`bootcmd` needs to be told _not_ to boot the rescue
+    image if there are records in pstore, because that interferes with
+    ``config.log.persistent``
+
+    .. code-block:: console
+
+        root@OpenWrt:~# fw_setenv orig_boot_production $(fw_printenv -n boot_production)
+        root@OpenWrt:~# fw_setenv orig_bootcmd $(fw_printenv -n bootcmd)
+        root@OpenWrt:~# fw_setenv boot_production 'led $bootled_pwr on ; ubifsmount ubi0:liminix && ubifsload ''${loadaddr} boot/fit && bootm ''${loadaddr}'
+        root@OpenWrt:~# fw_setenv bootcmd 'run boot_ubi'
+
+    For subsequent Liminix reinstalls, just run the
+    :command:`ubiupdatevol` command again. You don't need to repeat
+    the "Preparation" step and in fact should seek to avoid it if
+    possible, as it will reset the erase counters used for write
+    levelling.  Using UBI-aware tools is therefore preferred over any
+    kind of "factory" wipe which will reset them.
+  '';
 
   system = {
     crossSystem = {
@@ -38,200 +115,218 @@
     };
   };
 
-  module = {pkgs, config, lib, lim, ... }:
-    let firmware = pkgs.stdenv.mkDerivation {
-          name = "wlan-firmware";
-          phases = ["installPhase"];
-          installPhase = ''
-            mkdir $out
-            cp ${pkgs.linux-firmware}/lib/firmware/mediatek/{mt7915,mt7615,mt7622}* $out
-          '';
-        };
-    in {
+  module =
+    {
+      pkgs,
+      config,
+      lib,
+      lim,
+      ...
+    }:
+    let
+      inherit (lib) mkIf;
+      firmware = pkgs.stdenv.mkDerivation {
+        name = "wlan-firmware";
+        phases = [ "installPhase" ];
+        installPhase = ''
+          mkdir $out
+          cp ${pkgs.linux-firmware}/lib/firmware/mediatek/{mt7915,mt7615,mt7622}* $out
+        '';
+      };
+      openwrt = pkgs.openwrt_24_10;
+    in
+    {
       imports = [
         ../../modules/arch/aarch64.nix
         ../../modules/outputs/tftpboot.nix
         ../../modules/outputs/ubifs.nix
       ];
       config = {
-    kernel = {
-      src = pkgs.pkgsBuildBuild.fetchurl {
-        name = "linux.tar.gz";
-        url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
-        hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
-      };
-      extraPatchPhase = ''
-          ${pkgs.openwrt.applyPatches.mediatek}
-      '';
-      config = {
-        PCI = "y";
-        ARCH_MEDIATEK = "y";
-        # ARM_MEDIATEK_CPUFREQ = "y";
+        kernel = {
+          extraPatchPhase = ''
+            ${openwrt.applyPatches.mediatek}
+          '';
+          src = openwrt.kernelSrc;
+          version = openwrt.kernelVersion;
+          config = {
+            PCI = "y";
+            ARCH_MEDIATEK = "y";
+            # ARM_MEDIATEK_CPUFREQ = "y";
 
-        # needed for "Cannot find regmap for /infracfg@10000000"
-        MFD_SYSCON = "y";
-        MTK_INFRACFG = "y";
+            # needed for "Cannot find regmap for /infracfg@10000000"
+            MFD_SYSCON = "y";
+            MTK_INFRACFG = "y";
 
-        MTK_PMIC_WRAP = "y";
-        NVMEM_MTK_EFUSE="y";
-        # MTK_HSDMA="y";
-        MTK_SCPSYS="y";
-        MTK_SCPSYS_PM_DOMAINS="y";
-        # MTK_THERMAL="y";
-        MTK_TIMER="y";
+            MTK_PMIC_WRAP = "y";
+            DMADEVICES = "y";
+            MTK_HSDMA = "y";
+            MTK_SCPSYS = "y";
+            MTK_SCPSYS_PM_DOMAINS = "y";
+            # MTK_THERMAL="y";
+            MTK_TIMER = "y";
 
-        COMMON_CLK_MT7622 = "y";
-        COMMON_CLK_MT7622_ETHSYS = "y";
-        COMMON_CLK_MT7622_HIFSYS = "y";
-        COMMON_CLK_MT7622_AUDSYS = "y";
-        PM_CLK="y";
+            COMMON_CLK_MT7622 = "y";
+            COMMON_CLK_MT7622_ETHSYS = "y";
+            COMMON_CLK_MT7622_HIFSYS = "y";
+            COMMON_CLK_MT7622_AUDSYS = "y";
+            PM_CLK = "y";
 
-        REGMAP_MMIO = "y";
-        CLKSRC_MMIO = "y";
-        REGMAP = "y";
+            REGMAP_MMIO = "y";
+            CLKSRC_MMIO = "y";
+            REGMAP = "y";
 
-        MEDIATEK_GE_PHY = "y";
-        # MEDIATEK_MT6577_AUXADC = "y";
-        NET_MEDIATEK_SOC = "y";
-        NET_MEDIATEK_SOC_WED = "y";
-        NET_MEDIATEK_STAR_EMAC = "y"; # this enables REGMAP_MMIO
-        NET_VENDOR_MEDIATEK = "y";
-        PCIE_MEDIATEK = "y";
+            MEDIATEK_GE_PHY = "y";
+            # MEDIATEK_MT6577_AUXADC = "y";
+            NET_MEDIATEK_SOC = "y";
+            NET_MEDIATEK_SOC_WED = "y";
+            NET_MEDIATEK_STAR_EMAC = "y"; # this enables REGMAP_MMIO
+            NET_VENDOR_MEDIATEK = "y";
+            PCIE_MEDIATEK = "y";
 
-        BLOCK = "y"; # move this to base option
+            BLOCK = "y"; # move this to base option
 
-        SPI_MASTER = "y";
-        SPI = "y";
-        SPI_MEM="y";
-        SPI_MTK_NOR="y";
-        SPI_MTK_SNFI = "y";
+            SPI_MASTER = "y";
+            SPI = "y";
+            SPI_MEM = "y";
+            SPI_MTK_NOR = "y";
+            SPI_MTK_SNFI = "y";
 
-        MTD = "y";
-        MTD_BLOCK = "y";
-        MTD_RAW_NAND = "y";
-        MTD_NAND_MTK = "y";
-        MTD_NAND_MTK_BMT = "y";      # Bad-block Management Table
-        MTD_NAND_ECC_MEDIATEK= "y";
-        MTD_NAND_ECC_SW_HAMMING= "y";
-        MTD_SPI_NAND= "y";
-        MTD_OF_PARTS = "y";
-        MTD_NAND_CORE= "y";
-        MTD_SPI_NOR= "y";
-        MTD_SPLIT_FIRMWARE= "y";
-        MTD_SPLIT_FIT_FW= "y";
+            MTD = "y";
+            MTD_BLOCK = "y";
+            MTD_RAW_NAND = "y";
+            MTD_NAND_MTK = "y";
+            MTD_NAND_MTK_BMT = "y"; # Bad-block Management Table
+            MTD_NAND_ECC_MEDIATEK = "y";
+            MTD_NAND_ECC_SW_HAMMING = "y";
+            MTD_SPI_NAND = "y";
+            MTD_OF_PARTS = "y";
+            MTD_NAND_CORE = "y";
+            MTD_SPI_NOR = "y";
+            MTD_SPLIT_FIRMWARE = "y";
+            MTD_SPLIT_FIT_FW = "y";
 
+            MTD_UBI_NVMEM = "y";
+            NVMEM_MTK_EFUSE = "y";
+            NVMEM_BLOCK = "y";
+            NVMEM_LAYOUT_ADTRAN = "y";
 
-        MMC = "y";
-        MMC_BLOCK = "y";
-        MMC_CQHCI = "y";
-        MMC_MTK = "y";
+            MMC = "y";
+            MMC_BLOCK = "y";
+            MMC_CQHCI = "y";
+            MMC_MTK = "y";
 
-        # Distributed Switch Architecture is needed
-        # to make the ethernet ports visible
-        NET_DSA="y";
-        NET_DSA_MT7530="y";
-        NET_DSA_TAG_MTK="y";
+            # Distributed Switch Architecture is needed
+            # to make the ethernet ports visible
+            NET_DSA = "y";
+            NET_DSA_MT7530 = "y";
+            NET_DSA_TAG_MTK = "y";
+            NET_DSA_MT7530_MDIO = "y";
 
-        PSTORE = "y";
-        PSTORE_RAM = "y";
-        PSTORE_CONSOLE = "y";
-        PSTORE_DEFLATE_COMPRESS = "n";
+            SERIAL_8250 = "y";
+            SERIAL_8250_CONSOLE = "y";
+            SERIAL_8250_MT6577 = "y";
+            # SERIAL_8250_NR_UARTS="3";
+            # SERIAL_8250_RUNTIME_UARTS="3";
+            SERIAL_OF_PLATFORM = "y";
 
-        SERIAL_8250 = "y";
-        SERIAL_8250_CONSOLE = "y";
-        SERIAL_8250_MT6577="y";
-        # SERIAL_8250_NR_UARTS="3";
-        # SERIAL_8250_RUNTIME_UARTS="3";
-        SERIAL_OF_PLATFORM="y";
-
-        # Must enble hardware watchdog drivers. Else the device reboots after several seconds
-        WATCHDOG = "y";
-        MEDIATEK_WATCHDOG = "y";
-      };
-      conditionalConfig = {
-        WLAN= {
-          MT7615E = "m";
-          MT7622_WMAC = "y";
-          MT7915E = "m";
-        };
-      };
-    };
-    boot = {
-      commandLine = [ "console=ttyS0,115200" ];
-      tftp.loadAddress = lim.parseInt "0x4007ff28";
-      imageFormat = "fit";
-    };
-    filesystem =
-      let inherit (pkgs.pseudofile) dir symlink;
-           in
-             dir {
-               lib = dir {
-                 firmware = dir {
-                   mediatek = symlink firmware;
-                 };
-               };
-             };
-
-    hardware =
-      let
-        openwrt = pkgs.openwrt;
-        mac80211 =  pkgs.kmodloader.override {
-          targets = ["mt7615e" "mt7915e"];
-          inherit (config.system.outputs) kernel;
-        };
-      in {
-        ubi = {
-          minIOSize = "2048";
-          eraseBlockSize = "126976";
-          maxLEBcount = "1024"; # guessing
-        };
-
-        defaultOutput = "ubimage";
-        # the kernel expects this to be on a 2MB boundary. U-Boot
-        # (I don't know why) has a default of 0x41080000, which isn't.
-        # We put it at the 32MB mark so that tftpboot can put its rootfs
-        # image and DTB underneath, but maybe this is a terrible waste of
-        # RAM unless the kernel is able to reuse it later. Oh well
-        loadAddress = lim.parseInt "0x42000000";
-        entryPoint = lim.parseInt "0x42000000";
-        rootDevice = "ubi0:liminix";
-        dts = {
-          src = "${openwrt.src}/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts";
-          includes =  [
-            "${openwrt.src}/target/linux/mediatek/dts"
-            "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
-          ];
-        };
-
-        # - 0x000000000000-0x000008000000 : "spi-nand0"
-        #         - 0x000000000000-0x000000080000 : "bl2"
-        #         - 0x000000080000-0x0000001c0000 : "fip"
-        #         - 0x0000001c0000-0x0000002c0000 : "factory"
-        #         - 0x0000002c0000-0x000000300000 : "reserved"
-        #         - 0x000000300000-0x000008000000 : "ubi"
-
-        networkInterfaces =
-          let
-            inherit (config.system.service.network) link;
-            inherit (config.system.service) bridge;
-          in rec {
-            wan = link.build { ifname = "wan"; };
-            lan1 = link.build { ifname = "lan1"; };
-            lan2 = link.build { ifname = "lan2"; };
-            lan3 = link.build { ifname = "lan3"; };
-            lan4 = link.build { ifname = "lan4"; };
-            lan = lan3;
-
-            wlan = link.build {
-              ifname = "wlan0";
-              dependencies = [ mac80211 ];
-            };
-            wlan5 = link.build {
-              ifname = "wlan1";
-              dependencies = [ mac80211 ];
+            # Must enble hardware watchdog drivers. Else the device reboots after several seconds
+            WATCHDOG = "y";
+            MEDIATEK_WATCHDOG = "y";
+          };
+          conditionalConfig = {
+            WLAN = {
+              MT7615E = "m";
+              MT7622_WMAC = "y";
+              MT7915E = "m";
             };
           };
+        };
+        boot = {
+          commandLine = [ "console=ttyS0,115200" ];
+          tftp.loadAddress = lim.parseInt "0x48000000";
+          imageFormat = "fit";
+          loader.fit.enable = lib.mkDefault true; # override this if you are building tftpboot
+        };
+        rootfsType = lib.mkDefault "ubifs"; # override this if you are building tftpboot
+        filesystem =
+          let
+            inherit (pkgs.pseudofile) dir symlink;
+          in
+          dir {
+            lib = dir {
+              firmware = dir {
+                mediatek = symlink firmware;
+              };
+            };
+          };
+
+        hardware =
+          let
+            mac80211 = pkgs.kmodloader.override {
+              targets = [
+                "mt7615e"
+                "mt7915e"
+              ];
+              inherit (config.system.outputs) kernel;
+            };
+          in
+          {
+            ubi = {
+              minIOSize = "2048";
+              logicalEraseBlockSize = "126976";
+              physicalEraseBlockSize = "131072";
+              maxLEBcount = "1024"; # guessing
+            };
+
+            defaultOutput = "ubimage";
+            # the kernel expects this to be on a 2MB boundary. U-Boot
+            # (I don't know why) has a default of 0x41080000, which isn't.
+            # We put it at the 32MB mark so that tftpboot can put its rootfs
+            # image and DTB underneath, but maybe this is a terrible waste of
+            # RAM unless the kernel is able to reuse it later. Oh well
+            loadAddress = lim.parseInt "0x42000000";
+            entryPoint = lim.parseInt "0x42000000";
+            rootDevice = "ubi0:liminix";
+            dts = {
+              src = "${openwrt.src}/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts";
+              includePaths = [
+                "${openwrt.src}/target/linux/mediatek/dts"
+                "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
+              ];
+              includes = mkIf config.logging.persistent.enable [
+                ./pstore-pmsg.dtsi
+              ];
+            };
+
+            # - 0x000000000000-0x000008000000 : "spi-nand0"
+            #         - 0x000000000000-0x000000080000 : "bl2"
+            #         - 0x000000080000-0x0000001c0000 : "fip"
+            #         - 0x0000001c0000-0x0000002c0000 : "factory"
+            #         - 0x0000002c0000-0x000000300000 : "reserved"
+            #         - 0x000000300000-0x000008000000 : "ubi"
+
+            networkInterfaces =
+              let
+                inherit (config.system.service.network) link;
+              in
+              rec {
+                wan = link.build { ifname = "wan"; };
+                lan1 = link.build { ifname = "lan1"; };
+                lan2 = link.build { ifname = "lan2"; };
+                lan3 = link.build { ifname = "lan3"; };
+                lan4 = link.build { ifname = "lan4"; };
+                lan = lan3;
+
+                wlan = link.build {
+                  ifname = "wlan0";
+                  dependencies = [ mac80211 ];
+                };
+                wlan5 = link.build {
+                  ifname = "wlan1";
+                  dependencies = [ mac80211 ];
+                };
+              };
+          };
       };
-      };
-  };
+    };
 }

devices/belkin-rt3200/pstore-pmsg.dtsi

@@ -0,0 +1,8 @@
+/ {
+	reserved-memory {
+		/* make sure address matches upstream  */
+		ramoops@42ff0000 {
+			pmsg-size = <0x10000>;
+		};
+	};
+};

devices/families/qemu.nix

@@ -5,11 +5,6 @@
   ];
   config = {
     kernel = {
-      src = pkgs.pkgsBuildBuild.fetchurl {
-        name = "linux.tar.gz";
-        url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
-        hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
-      };
       config = {
         MTD = "y";
         MTD_BLOCK = "y";
@@ -23,27 +18,35 @@
         VIRTIO_BLK = "y";
         VIRTIO_NET = "y";
       };
+      conditionalConfig = {
+        WLAN = {
+          MAC80211_HWSIM = "m";
+        };
+      };
     };
     hardware =
       let
-        mac80211 =  pkgs.mac80211.override {
-          drivers = ["mac80211_hwsim"];
-          klibBuild = config.system.outputs.kernel.modulesupport;
+        mac80211 = pkgs.kmodloader.override {
+          inherit (config.system.outputs) kernel;
+          targets = [ "mac80211_hwsim" ];
         };
-      in {
+      in
+      {
         defaultOutput = "vmroot";
         rootDevice = "/dev/mtdblock0";
         dts.src = pkgs.lib.mkDefault null;
         flash.eraseBlockSize = 65536;
         networkInterfaces =
-          let inherit (config.system.service.network) link;
-          in {
+          let
+            inherit (config.system.service.network) link;
+          in
+          {
             wan = link.build {
-              devpath = "/devices/pci0000:00/0000:00:13.0/virtio0";
+              devpath = "/devices/pci0000:00/0000:00:12.0/virtio0";
               ifname = "wan";
             };
             lan = link.build {
-              devpath = "/devices/pci0000:00/0000:00:14.0/virtio1";
+              devpath = "/devices/pci0000:00/0000:00:13.0/virtio1";
               ifname = "lan";
             };
 

devices/gl-ar750/default.nix

@@ -4,7 +4,7 @@
       config = "mips-unknown-linux-musl";
       gcc = {
         abi = "32";
-        arch = "24kc";          # maybe mips_24kc-
+        arch = "24kc"; # maybe mips_24kc-
       };
     };
   };
@@ -41,10 +41,11 @@
     :ref:`system-outputs-mtdimage` can be flashed using the
     vendor web UI or the U-Boot emergency "unbrick" routine.
 
-    For flashing from an existing Liminix system (we believe that) it
-    is necessary to first boot into a :ref:`system-outputs-kexecboot`
-    system, otherwise you'll be overwriting flash partitions while
-    they're in use - and that might not end well.
+    Flashing over an existing Liminix system is not possible while
+    that system is running, otherwise you'll be overwriting flash
+    partitions while they're in use - and that might not end well.
+    Configure the system with :ref:`levitate` if you need to
+    make it upgradable.
 
     Vendor web page: https://www.gl-inet.com/products/gl-ar750/
 
@@ -52,8 +53,16 @@
 
   '';
 
-  module = {pkgs, config, lim, ... }:
+  module =
+    {
+      pkgs,
+      config,
+      lim,
+      lib,
+      ...
+    }:
     let
+      inherit (lib) mkIf;
       openwrt = pkgs.openwrt;
       firmwareBlobs = pkgs.pkgsBuildBuild.fetchFromGitHub {
         owner = "kvalo";
@@ -63,7 +72,7 @@
       };
       firmware = pkgs.stdenv.mkDerivation {
         name = "wlan-firmware";
-        phases = ["installPhase"];
+        phases = [ "installPhase" ];
         installPhase = ''
           mkdir -p $out/ath10k/QCA9887/hw1.0/
           blobdir=${firmwareBlobs}/QCA9887/hw1.0
@@ -72,7 +81,10 @@
         '';
       };
       mac80211 = pkgs.kmodloader.override {
-        targets = ["ath9k" "ath10k_pci"];
+        targets = [
+          "ath9k"
+          "ath10k_pci"
+        ];
         inherit (config.system.outputs) kernel;
         dependencies = [ ath10k_cal_data ];
       };
@@ -80,7 +92,8 @@
         let
           offset = lim.parseInt "0x5000";
           size = lim.parseInt "0x844";
-        in pkgs.liminix.services.oneshot rec  {
+        in
+        pkgs.liminix.services.oneshot rec {
           name = "ath10k_cal_data";
           up = ''
             part=$(basename $(dirname $(grep -l art /sys/class/mtd/*/name)))
@@ -89,11 +102,11 @@
             (in_outputs ${name}
              dd if=/dev/$part of=data iflag=skip_bytes,fullblock bs=${toString size} skip=${toString offset} count=1
             )
-        '';
-      };
+          '';
+        };
       inherit (pkgs.pseudofile) dir symlink;
-      inherit (pkgs.liminix.networking) interface;
-    in {
+    in
+    {
       imports = [
         ../../modules/network
         ../../modules/arch/mipseb.nix
@@ -117,23 +130,37 @@
         rootDevice = "/dev/mtdblock5";
         dts = {
           src = "${openwrt.src}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts";
-          includes =  [
+          includePaths = [
             "${openwrt.src}/target/linux/ath79/dts"
           ];
+          includes = mkIf config.logging.persistent.enable [
+            ./pstore-ramoops.dtsi
+          ];
         };
 
         networkInterfaces =
-          let inherit (config.system.service.network) link;
-          in {
-            lan = link.build { ifname = "eth0"; };
-            wan = link.build { ifname = "eth1"; };
+          let
+            inherit (config.system.service.network) link;
+          in
+          {
+            lan = link.build {
+              ifname = "lan";
+              devpath = "/devices/platform/ahb/1a000000.eth";
+            };
+            wan = link.build {
+              ifname = "wan";
+              devpath = "/devices/platform/ahb/19000000.eth";
+            };
             wlan = link.build {
               ifname = "wlan0";
               dependencies = [ mac80211 ];
             };
             wlan5 = link.build {
               ifname = "wlan1";
-              dependencies = [ ath10k_cal_data mac80211  ];
+              dependencies = [
+                ath10k_cal_data
+                mac80211
+              ];
             };
           };
       };
@@ -149,14 +176,9 @@
       };
       boot.tftp = {
         loadAddress = lim.parseInt "0x00A00000";
+        appendDTB = true;
       };
       kernel = {
-        src = pkgs.pkgsBuildBuild.fetchurl {
-          name = "linux.tar.gz";
-          url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
-          hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
-        };
-
         # Mainline linux 5.19 doesn't have device-tree support for
         # this device or even for the SoC, so we use the extensive
         # OpenWrt kernel patches
@@ -188,31 +210,31 @@
           NET = "y";
           ETHERNET = "y";
           NET_VENDOR_ATHEROS = "y";
-          AG71XX = "y";             # ethernet (qca,qca9530-eth)
-          MFD_SYSCON = "y";         # ethernet (compatible "syscon")
-          AR8216_PHY = "y";         # eth1 is behind a switch
+          AG71XX = "y"; # ethernet (qca,qca9530-eth)
+          MFD_SYSCON = "y"; # ethernet (compatible "syscon")
+          AR8216_PHY = "y"; # eth1 is behind a switch
 
           MTD_SPI_NOR = "y";
 
-          SPI_ATH79 = "y";      # these are copied from OpenWrt.
-          SPI_MASTER= "y";      # At least one of them is necessary
-          SPI_MEM= "y";
-          SPI_AR934X= "y";
-          SPI_BITBANG= "y";
-          SPI_GPIO= "y";
+          SPI_ATH79 = "y"; # these are copied from OpenWrt.
+          SPI_MASTER = "y"; # At least one of them is necessary
+          SPI_MEM = "y";
+          SPI_AR934X = "y";
+          SPI_BITBANG = "y";
+          SPI_GPIO = "y";
 
           GPIO_ATH79 = "y";
           GPIOLIB = "y";
-          EXPERT="y";
+          EXPERT = "y";
           GPIO_SYSFS = "y"; # required by patches-5.15/0004-phy-add-ath79-usb-phys.patch
           OF_GPIO = "y";
           SYSFS = "y";
           SPI = "y";
           MTD = "y";
-          MTD_BLOCK = "y";          # fix undefined ref to register_mtd_blktrans_devs
+          MTD_BLOCK = "y"; # fix undefined ref to register_mtd_blktrans_devs
 
           WATCHDOG = "y";
-          ATH79_WDT = "y";  # watchdog timer
+          ATH79_WDT = "y"; # watchdog timer
 
           EARLY_PRINTK = "y";
 

devices/gl-ar750/pstore-ramoops.dtsi

@@ -0,0 +1,9 @@
+/ {
+reserved-memory {
+		ramoops@03f00000 {
+			compatible = "ramoops";
+			reg = <0x03f00000 0x10000>;
+			pmsg-size = <0x10000>;
+		};
+	};
+};

devices/gl-mt300a/default.nix

@@ -6,7 +6,7 @@
       config = "mipsel-unknown-linux-musl";
       gcc = {
         abi = "32";
-        arch = "mips32";          # maybe mips_24kc-
+        arch = "mips32"; # maybe mips_24kc-
       };
     };
   };
@@ -32,10 +32,11 @@
     binary created by :ref:`system-outputs-mtdimage` can be flashed
     using the vendor web UI or the U-Boot emergency "unbrick" routine.
 
-    For flashing from an existing Liminix system (we think) it
-    is necessary to first boot into a :ref:`system-outputs-kexecboot`
-    system, otherwise you'll be overwriting flash partitions while
-    they're in use - and that might not end well.
+    Flashing over an existing Liminix system is not possible while
+    that system is running, otherwise you'll be overwriting flash
+    partitions while they're in use - and that might not end well.
+    Configure the system with :ref:`levitate` if you need to
+    make it upgradable.
 
     Vendor web page: https://www.gl-inet.com/products/gl-mt300a/
 
@@ -43,15 +44,22 @@
 
   '';
 
-  module = { pkgs, config, lib, lim, ...}:
+  module =
+    {
+      pkgs,
+      config,
+      lib,
+      lim,
+      ...
+    }:
     let
-      inherit (pkgs.liminix.networking) interface;
       inherit (pkgs) openwrt;
       mac80211 = pkgs.kmodloader.override {
-        targets = ["rt2800soc"];
+        targets = [ "rt2800soc" ];
         inherit (config.system.outputs) kernel;
       };
-    in {
+    in
+    {
       imports = [
         ../../modules/arch/mipsel.nix
         ../../modules/outputs/tftpboot.nix
@@ -82,7 +90,7 @@
 
         dts = {
           src = "${openwrt.src}/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts";
-          includes = [
+          includePaths = [
             "${openwrt.src}/target/linux/ramips/dts"
           ];
         };
@@ -90,20 +98,8 @@
           let
             inherit (config.system.service.network) link;
             inherit (config.system.service) vlan;
-            inherit (pkgs.liminix.services) oneshot;
-            swconfig = oneshot {
-              name = "swconfig";
-              up = ''
-                PATH=${pkgs.swconfig}/bin:$PATH
-                swconfig dev switch0 set reset
-                swconfig dev switch0 set enable_vlan 1
-                swconfig dev switch0 vlan 1 set ports '1 2 3 4 6t'
-                swconfig dev switch0 vlan 2 set ports '0 6t'
-                swconfig dev switch0 set apply
-              '';
-              down = "${pkgs.swconfig}/bin/swconfig dev switch0 set reset";
-            };
-          in rec {
+          in
+          rec {
             eth = link.build { ifname = "eth0"; };
             # lan and wan ports are both behind a switch on eth0
             lan = vlan.build {
@@ -125,59 +121,56 @@
       boot.tftp = {
         loadAddress = lim.parseInt "0x00A00000";
         appendDTB = true;
-     };
+      };
 
       kernel = {
-        src = pkgs.fetchurl {
-          name = "linux.tar.gz";
-          url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
-          hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
-        };
         extraPatchPhase = ''
           ${openwrt.applyPatches.ramips}
           ${openwrt.applyPatches.rt2x00}
         '';
-        config = {
+        config =
+          {
 
-          RALINK = "y";
-          PCI = "y";
-          SOC_MT7620 = "y";
+            RALINK = "y";
+            PCI = "y";
+            SOC_MT7620 = "y";
 
-          SERIAL_8250_CONSOLE = "y";
-          SERIAL_8250 = "y";
-          SERIAL_CORE_CONSOLE = "y";
-          SERIAL_OF_PLATFORM = "y";
+            SERIAL_8250_CONSOLE = "y";
+            SERIAL_8250 = "y";
+            SERIAL_CORE_CONSOLE = "y";
+            SERIAL_OF_PLATFORM = "y";
 
-          CONSOLE_LOGLEVEL_DEFAULT = "8";
-          CONSOLE_LOGLEVEL_QUIET = "4";
+            CONSOLE_LOGLEVEL_DEFAULT = "8";
+            CONSOLE_LOGLEVEL_QUIET = "4";
 
-          NET = "y";
-          ETHERNET = "y";
-          NET_VENDOR_RALINK = "y";
-          NET_RALINK_MDIO = "y";
-          NET_RALINK_MDIO_MT7620 = "y";
-          NET_RALINK_MT7620 = "y";
-          SWPHY = "y";
+            NET = "y";
+            ETHERNET = "y";
+            NET_VENDOR_RALINK = "y";
+            NET_RALINK_MDIO = "y";
+            NET_RALINK_MDIO_MT7620 = "y";
+            NET_RALINK_MT7620 = "y";
+            SWPHY = "y";
 
-          SPI = "y";
-          MTD_SPI_NOR = "y";
-          SPI_MT7621 = "y"; # } probably don't need both of these
-          SPI_RT2880 = "y"; # }
-          SPI_MASTER= "y";
-          SPI_MEM= "y";
+            SPI = "y";
+            MTD_SPI_NOR = "y";
+            SPI_MT7621 = "y"; # } probably don't need both of these
+            SPI_RT2880 = "y"; # }
+            SPI_MASTER = "y";
+            SPI_MEM = "y";
 
-          MTD = "y";
-          MTD_BLOCK = "y";         # fix undefined ref to register_mtd_blktrans_devs
+            MTD = "y";
+            MTD_BLOCK = "y"; # fix undefined ref to register_mtd_blktrans_devs
 
-          EARLY_PRINTK = "y";
+            EARLY_PRINTK = "y";
 
-          NEW_LEDS = "y";
-          LEDS_CLASS = "y";         # required by rt2x00lib
+            NEW_LEDS = "y";
+            LEDS_CLASS = "y"; # required by rt2x00lib
 
-          PRINTK_TIME = "y";
-        } // lib.optionalAttrs (config.system.service ? vlan) {
-          SWCONFIG = "y";
-        };
+            PRINTK_TIME = "y";
+          }
+          // lib.optionalAttrs (config.system.service ? vlan) {
+            SWCONFIG = "y";
+          };
         conditionalConfig = {
           WLAN = {
             WLAN_VENDOR_RALINK = "y";

devices/gl-mt300n-v2/default.nix

@@ -4,7 +4,7 @@
       config = "mipsel-unknown-linux-musl";
       gcc = {
         abi = "32";
-        arch = "mips32";          # maybe mips_24kc-
+        arch = "mips32"; # maybe mips_24kc-
       };
     };
   };
@@ -13,7 +13,7 @@
     GL.iNet GL-MT300N-v2
     ********************
 
-    The GL-MT300N-v2 "Mango" is is very similar to the :ref:`MT300A <GL.iNet GL-MT300A>, but is
+    The GL-MT300N-v2 "Mango" is is very similar to the :ref:`gl-mt300a`, but is
     based on the MT7628 chipset instead of MT7620.  It's also marginally cheaper
     and comes in a yellow case not a blue one.  Be sure your device is
     v2 not v1, which is a different animal and has only half as much RAM.
@@ -25,10 +25,11 @@
     binary created by :ref:`system-outputs-mtdimage` can be flashed
     using the vendor web UI or the U-Boot emergency "unbrick" routine.
 
-    For flashing from an existing Liminix system (we think) it
-    is necessary to first boot into a :ref:`system-outputs-kexecboot`
-    system, otherwise you'll be overwriting flash partitions while
-    they're in use - and that might not end well.
+    Flashing over an existing Liminix system is not possible while
+    that system is running, otherwise you'll be overwriting flash
+    partitions while they're in use - and that might not end well.
+    Configure the system with :ref:`levitate` if you need to
+    make it upgradable.
 
     Vendor web page: https://www.gl-inet.com/products/gl-mt300n-v2/
 
@@ -36,22 +37,29 @@
 
   '';
 
-  module = { pkgs, config, lib, lim, ...}:
+  module =
+    {
+      pkgs,
+      config,
+      lib,
+      lim,
+      ...
+    }:
     let
-      inherit (pkgs.liminix.networking) interface;
       inherit (pkgs.liminix.services) oneshot;
       inherit (pkgs.pseudofile) dir symlink;
       inherit (pkgs) openwrt;
 
       mac80211 = pkgs.kmodloader.override {
-        targets = ["mt7603e"];
+        targets = [ "mt7603e" ];
         inherit (config.system.outputs) kernel;
       };
       wlan_firmware = pkgs.fetchurl {
         url = "https://github.com/openwrt/mt76/raw/f24b56f935392ca1d35fae5fd6e56ef9deda4aad/firmware/mt7628_e2.bin";
         hash = "sha256:1dkhfznmdz6s50kwc841x3wj0h6zg6icg5g2bim9pvg66as2vmh9";
       };
-    in {
+    in
+    {
       imports = [
         ../../modules/arch/mipsel.nix
         ../../modules/outputs/tftpboot.nix
@@ -79,7 +87,7 @@
 
         dts = {
           src = "${openwrt.src}/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts";
-          includes = [
+          includePaths = [
             "${openwrt.src}/target/linux/ramips/dts"
           ];
         };
@@ -99,8 +107,12 @@
               '';
               down = "${pkgs.swconfig}/bin/swconfig dev switch0 set reset";
             };
-          in rec {
-            eth = link.build { ifname = "eth0"; dependencies =  [swconfig]; };
+          in
+          rec {
+            eth = link.build {
+              ifname = "eth0";
+              dependencies = [ swconfig ];
+            };
             # lan and wan ports are both behind a switch on eth0
             lan = vlan.build {
               ifname = "eth0.1";
@@ -126,66 +138,64 @@
       };
 
       kernel = {
-        src = pkgs.fetchurl {
-          name = "linux.tar.gz";
-          url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
-          hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
-        };
         extraPatchPhase = ''
           ${openwrt.applyPatches.ramips}
         '';
-        config = {
+        config =
+          {
 
-          RALINK = "y";
-          PCI = "y";
-          SOC_MT7620 = "y";
+            RALINK = "y";
+            PCI = "y";
+            SOC_MT7620 = "y";
 
-          SERIAL_8250_CONSOLE = "y";
-          SERIAL_8250 = "y";
-          SERIAL_CORE_CONSOLE = "y";
-          SERIAL_OF_PLATFORM = "y";
+            SERIAL_8250_CONSOLE = "y";
+            SERIAL_8250 = "y";
+            SERIAL_CORE_CONSOLE = "y";
+            SERIAL_OF_PLATFORM = "y";
 
-          CONSOLE_LOGLEVEL_DEFAULT = "8";
-          CONSOLE_LOGLEVEL_QUIET = "4";
+            CONSOLE_LOGLEVEL_DEFAULT = "8";
+            CONSOLE_LOGLEVEL_QUIET = "4";
 
-          MTD = "y";
-          MTD_BLOCK = "y";          # fix undefined ref to register_mtd_blktrans_dev
+            MTD = "y";
+            MTD_BLOCK = "y"; # fix undefined ref to register_mtd_blktrans_dev
 
-          SPI = "y";
-          MTD_SPI_NOR = "y";
-          SPI_MT7621 = "y";
-          SPI_MASTER= "y";
-          SPI_MEM= "y";
+            SPI = "y";
+            MTD_SPI_NOR = "y";
+            SPI_MT7621 = "y";
+            SPI_MASTER = "y";
+            SPI_MEM = "y";
 
-          REGULATOR = "y";
-          REGULATOR_FIXED_VOLTAGE = "y";
+            REGULATOR = "y";
+            REGULATOR_FIXED_VOLTAGE = "y";
 
-          NET = "y";
-          ETHERNET = "y";
+            NET = "y";
+            ETHERNET = "y";
 
-          PHYLIB = "y";
-          AT803X_PHY="y";
-          FIXED_PHY="y";
-          GENERIC_PHY="y";
-          NET_VENDOR_RALINK = "y";
-          NET_RALINK_RT3050 = "y";
-          NET_RALINK_SOC="y";
-          SWPHY = "y";
+            PHYLIB = "y";
+            AT803X_PHY = "y";
+            FIXED_PHY = "y";
+            GENERIC_PHY = "y";
+            NET_VENDOR_RALINK = "y";
+            NET_RALINK_RT3050 = "y";
+            NET_RALINK_SOC = "y";
+            SWPHY = "y";
 
-          GPIOLIB="y";
-          GPIO_MT7621 = "y";
+            GPIOLIB = "y";
+            GPIO_MT7621 = "y";
 
-          PHY_RALINK_USB = "y";
+            PHY_RALINK_USB = "y";
 
-          EARLY_PRINTK = "y";
+            EARLY_PRINTK = "y";
 
-          PRINTK_TIME = "y";
-        } // lib.optionalAttrs (config.system.service ? vlan) {
-          SWCONFIG = "y";
-        } // lib.optionalAttrs (config.system.service ? watchdog) {
-          RALINK_WDT = "y";  # watchdog
-          MT7621_WDT = "y";  # or it might be this one
-        };
+            PRINTK_TIME = "y";
+          }
+          // lib.optionalAttrs (config.system.service ? vlan) {
+            SWCONFIG = "y";
+          }
+          // lib.optionalAttrs (config.system.service ? watchdog) {
+            RALINK_WDT = "y"; # watchdog
+            MT7621_WDT = "y"; # or it might be this one
+          };
         conditionalConfig = {
           WLAN = {
             WLAN_VENDOR_RALINK = "y";

devices/openwrt-one/default.nix

@@ -0,0 +1,751 @@
+{
+  description = ''
+    OpenWrt One
+    ***********
+
+    Hardware summary
+    ================
+
+    - MediaTek MT7981B (1300MHz)
+    - 256MB NAND Flash
+    - 1024MB RAM
+    - WLan hardware: Mediatek MT7976C
+
+    Status
+    ======
+
+    - Only tested over TFTP so far.
+    - WiFi (2.4G and 5G) works.
+    - 2.5G ethernet port works.
+
+    Limitations
+    ===========
+
+    - adding `he_bss_color="128"` causes `Invalid argument` for hostap
+    - nvme support untested
+    - I don't think the front LEDs work yet
+
+    Installation
+    ============
+
+      TODO: add instructions on how to boot directly from TFTP to memory
+      and how to install from TFTP to flash without going through OpenWrt.
+
+      The instructions below assume you can boot and SSH into OpenWrt:
+
+      Boot into OpenWrt and create a 'liminix' UBI partition:
+
+        root@OpenWrt:~# ubimkvol /dev/ubi0 --name=liminix --maxavsize
+
+    Remember the 'Volume ID' that was created for this new partition
+
+    Build the UBI image and write it to this new partition:
+
+        $ nix-build -I liminix-config=./my-configuration.nix  --arg device "import ./devices/openwrt-one" -A outputs.default
+        $ cat result/rootfs | ssh root@192.168.1.1 "cat > /tmp/rootfs"
+        $ ssh root@192.168.1.1
+        root@OpenWrt:~# ubiupdatevol /dev/ubi0_X /tmp/rootfs # replace X with the volume id, if needed check with `ubinfo`
+
+    Reboot into the U-Boot prompt and boot with:
+
+        OpenWrt One> ubifsmount ubi0:liminix && ubifsload ''${loadaddr} boot/fit && bootm ''${loadaddr}'
+
+    If this works, reboot into OpenWrt and configure U-Boot to boot ubifs by default:
+
+        root@OpenWrt:~# fw_setenv orig_boot_production $(fw_printenv -n boot_production)
+        root@OpenWrt:~# fw_setenv boot_production 'led white on ; ubifsmount ubi0:liminix && ubifsload ''${loadaddr} boot/fit && bootm ''${loadaddr}'
+
+    Troubleshooting
+    ===============
+
+      The instructions above assume you can boot and SSH into the (recovery)
+      OpenWrt installation. If you have broken your device to the point where that
+      is no longer possible, you could re-install OpenWrt, but probably you could
+      also install directly from U-Boot:
+
+        https://github.com/u-boot/u-boot/blob/master/doc/README.ubi
+  '';
+
+  system = {
+    crossSystem = {
+      config = "aarch64-unknown-linux-musl";
+      gcc = {
+        # https://openwrt.org/docs/techref/instructionset/aarch64_cortex-a53
+        # openwrt ./target/linux/mediatek/filogic/target.mk
+        # https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html
+        # https://en.wikipedia.org/wiki/Comparison_of_ARM_processors
+        arch = "armv8-a";
+      };
+    };
+  };
+
+  module =
+    {
+      pkgs,
+      config,
+      lib,
+      lim,
+      ...
+    }:
+    let
+      openwrt = pkgs.openwrt_24_10;
+      mediatek-firmware = pkgs.stdenv.mkDerivation {
+        name = "wlan-firmware";
+        phases = [ "installPhase" ];
+        installPhase = ''
+          mkdir $out
+
+          cp ${pkgs.linux-firmware}/lib/firmware/mediatek/{mt7915,mt7615,mt7986_eeprom_mt7976,mt7981}* $out
+        '';
+      };
+      airoha-firmware = pkgs.stdenv.mkDerivation {
+        name = "airoha-firmware";
+        phases = [ "installPhase" ];
+        installPhase = ''
+          mkdir $out
+
+          cp ${pkgs.linux-firmware}/lib/firmware/airoha/* $out
+        '';
+      };
+    in
+    {
+      imports = [
+        ../../modules/arch/aarch64.nix
+        ../../modules/outputs/tftpboot.nix
+        ../../modules/outputs/ubifs.nix
+      ];
+      config = {
+        kernel = {
+          src = openwrt.kernelSrc;
+          version = openwrt.kernelVersion;
+          extraPatchPhase = ''
+            ${openwrt.applyPatches.mediatek}
+          '';
+          config =
+            {
+              NET = "y"; # unlock NET_XGRESS
+              SERIAL_8250 = "y"; # unlock SERIAL_8250_FSL
+              SERIAL_8250_CONSOLE = "y"; # to get the serial console
+              WATCHDOG = "y"; # unlock WATCHDOG_CORE
+              NEW_LEDS = "y"; # unlock LEDS_PWM
+              LEDS_CLASS = "y"; # unlock LEDS_PWM
+              LEDS_TRIGGERS = "y"; # unlock LEDS_TRIGGER_PATTERN
+              DEFERRED_STRUCT_PAGE_INIT = "y"; # trigger PADATA
+              # Taken from openwrt's ./target/linux/mediatek/filogic/config-6.6
+              "64BIT" = "y";
+              AIROHA_EN8801SC_PHY = "y";
+              ARCH_BINFMT_ELF_EXTRA_PHDRS = "y";
+              ARCH_CORRECT_STACKTRACE_ON_KRETPROBE = "y";
+              ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG = "y";
+              ARCH_DMA_ADDR_T_64BIT = "y";
+              ARCH_FORCE_MAX_ORDER = "10";
+              ARCH_KEEP_MEMBLOCK = "y";
+              ARCH_MEDIATEK = "y";
+              ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE = "y";
+              ARCH_MMAP_RND_BITS = "18";
+              ARCH_MMAP_RND_BITS_MAX = "24";
+              ARCH_MMAP_RND_BITS_MIN = "18";
+              ARCH_MMAP_RND_COMPAT_BITS_MIN = "11";
+              ARCH_PROC_KCORE_TEXT = "y";
+              ARCH_SPARSEMEM_ENABLE = "y";
+              ARCH_STACKWALK = "y";
+              ARCH_SUSPEND_POSSIBLE = "y";
+              ARCH_WANTS_NO_INSTR = "y";
+              ARCH_WANTS_THP_SWAP = "y";
+              ARM64 = "y";
+              ARM64_4K_PAGES = "y";
+              ARM64_ERRATUM_843419 = "y";
+              ARM64_LD_HAS_FIX_ERRATUM_843419 = "y";
+              ARM64_PAGE_SHIFT = "12";
+              ARM64_PA_BITS = "48";
+              ARM64_PA_BITS_48 = "y";
+              ARM64_TAGGED_ADDR_ABI = "y";
+              ARM64_VA_BITS = "39";
+              ARM64_VA_BITS_39 = "y";
+              ARM_AMBA = "y";
+              ARM_ARCH_TIMER = "y";
+              ARM_ARCH_TIMER_EVTSTREAM = "y";
+              ARM_GIC = "y";
+              ARM_GIC_V2M = "y";
+              ARM_GIC_V3 = "y";
+              ARM_GIC_V3_ITS = "y";
+              ARM_GIC_V3_ITS_PCI = "y";
+              ARM_MEDIATEK_CPUFREQ = "y";
+              ARM_PMU = "y";
+              ARM_PMUV3 = "y";
+              ARM_PSCI_FW = "y";
+              ATA = "y";
+              AUDIT_ARCH_COMPAT_GENERIC = "y";
+              BLK_DEV_LOOP = "y";
+              BLK_DEV_SD = "y";
+              BLK_MQ_PCI = "y";
+              BLK_PM = "y";
+              BLOCK_NOTIFIERS = "y";
+              BSD_PROCESS_ACCT = "y";
+              BSD_PROCESS_ACCT_V3 = "y";
+              BUFFER_HEAD = "y";
+              BUILTIN_RETURN_ADDRESS_STRIPS_PAC = "y";
+              CC_HAVE_SHADOW_CALL_STACK = "y";
+              CC_HAVE_STACKPROTECTOR_SYSREG = "y";
+              #CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5";
+              CC_NO_ARRAY_BOUNDS = "y";
+              CLKSRC_MMIO = "y";
+              CLONE_BACKWARDS = "y";
+              CMDLINE_OVERRIDE = "y";
+              COMMON_CLK = "y";
+              COMMON_CLK_MEDIATEK = "y";
+              COMMON_CLK_MT7981 = "y";
+              COMMON_CLK_MT7981_ETHSYS = "y";
+              COMMON_CLK_MT7986 = "y";
+              COMMON_CLK_MT7986_ETHSYS = "y";
+              COMMON_CLK_MT7988 = "y";
+              COMPACT_UNEVICTABLE_DEFAULT = "1";
+              CONFIGFS_FS = "y";
+              CONSOLE_LOGLEVEL_DEFAULT = "15";
+              CONTEXT_TRACKING = "y";
+              CONTEXT_TRACKING_IDLE = "y";
+              CPU_FREQ = "y";
+              CPU_FREQ_DEFAULT_GOV_USERSPACE = "y";
+              CPU_FREQ_GOV_ATTR_SET = "y";
+              CPU_FREQ_GOV_COMMON = "y";
+              CPU_FREQ_GOV_CONSERVATIVE = "y";
+              CPU_FREQ_GOV_ONDEMAND = "y";
+              CPU_FREQ_GOV_PERFORMANCE = "y";
+              CPU_FREQ_GOV_POWERSAVE = "y";
+              CPU_FREQ_GOV_SCHEDUTIL = "y";
+              CPU_FREQ_GOV_USERSPACE = "y";
+              CPU_FREQ_STAT = "y";
+              CPU_LITTLE_ENDIAN = "y";
+              CPU_RMAP = "y";
+              CPU_THERMAL = "y";
+              CRC16 = "y";
+              CRC_CCITT = "y";
+              CRYPTO_AES_ARM64 = "y";
+              CRYPTO_AES_ARM64_CE = "y";
+              CRYPTO_AES_ARM64_CE_BLK = "y";
+              CRYPTO_AES_ARM64_CE_CCM = "y";
+              CRYPTO_CMAC = "y";
+              CRYPTO_CRC32 = "y";
+              CRYPTO_CRC32C = "y";
+              CRYPTO_CRYPTD = "y";
+              CRYPTO_DEFLATE = "y";
+              CRYPTO_DRBG = "y";
+              CRYPTO_DRBG_HMAC = "y";
+              CRYPTO_DRBG_MENU = "y";
+              CRYPTO_ECB = "y";
+              CRYPTO_ECC = "y";
+              CRYPTO_ECDH = "y";
+              CRYPTO_GHASH_ARM64_CE = "y";
+              CRYPTO_HASH_INFO = "y";
+              CRYPTO_HMAC = "y";
+              CRYPTO_JITTERENTROPY = "y";
+              CRYPTO_LIB_BLAKE2S_GENERIC = "y";
+              CRYPTO_LIB_GF128MUL = "y";
+              CRYPTO_LIB_SHA1 = "y";
+              CRYPTO_LIB_SHA256 = "y";
+              CRYPTO_LIB_UTILS = "y";
+              CRYPTO_LZO = "y";
+              CRYPTO_RNG = "y";
+              CRYPTO_RNG2 = "y";
+              CRYPTO_RNG_DEFAULT = "y";
+              CRYPTO_SHA256 = "y";
+              CRYPTO_SHA256_ARM64 = "y";
+              CRYPTO_SHA2_ARM64_CE = "y";
+              CRYPTO_SHA3 = "y";
+              CRYPTO_SHA512 = "y";
+              CRYPTO_SM4 = "y";
+              CRYPTO_SM4_ARM64_CE_BLK = "y";
+              CRYPTO_SM4_ARM64_CE_CCM = "y";
+              CRYPTO_SM4_ARM64_CE_GCM = "y";
+              CRYPTO_ZSTD = "y";
+              DCACHE_WORD_ACCESS = "y";
+              #DEBUG_INFO="y";
+              DEBUG_MISC = "y";
+              DIMLIB = "y";
+              DMADEVICES = "y";
+              DMATEST = "y";
+              DMA_BOUNCE_UNALIGNED_KMALLOC = "y";
+              DMA_DIRECT_REMAP = "y";
+              DMA_ENGINE = "y";
+              DMA_ENGINE_RAID = "y";
+              DMA_OF = "y";
+              DMA_VIRTUAL_CHANNELS = "y";
+              DTC = "y";
+              EDAC_SUPPORT = "y";
+              EINT_MTK = "y";
+              EXCLUSIVE_SYSTEM_RAM = "y";
+              EXT4_FS = "y";
+              F2FS_FS = "y";
+              FIXED_PHY = "y";
+              FIX_EARLYCON_MEM = "y";
+              FRAME_POINTER = "y";
+              FS_IOMAP = "y";
+              FS_MBCACHE = "y";
+              FUNCTION_ALIGNMENT = "4";
+              FUNCTION_ALIGNMENT_4B = "y";
+              FWNODE_MDIO = "y";
+              FW_LOADER_PAGED_BUF = "y";
+              #FW_LOADER_SYSFS="y";
+              #GCC11_NO_ARRAY_BOUNDS="y";
+              #GCC_ASM_GOTO_OUTPUT_WORKAROUND="y";
+              GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS = "y";
+              GENERIC_ALLOCATOR = "y";
+              GENERIC_ARCH_TOPOLOGY = "y";
+              GENERIC_BUG = "y";
+              GENERIC_BUG_RELATIVE_POINTERS = "y";
+              GENERIC_CLOCKEVENTS = "y";
+              GENERIC_CLOCKEVENTS_BROADCAST = "y";
+              GENERIC_CPU_AUTOPROBE = "y";
+              GENERIC_CPU_VULNERABILITIES = "y";
+              GENERIC_CSUM = "y";
+              GENERIC_EARLY_IOREMAP = "y";
+              GENERIC_GETTIMEOFDAY = "y";
+              GENERIC_IDLE_POLL_SETUP = "y";
+              GENERIC_IOREMAP = "y";
+              GENERIC_IRQ_EFFECTIVE_AFF_MASK = "y";
+              GENERIC_IRQ_SHOW = "y";
+              GENERIC_IRQ_SHOW_LEVEL = "y";
+              GENERIC_LIB_DEVMEM_IS_ALLOWED = "y";
+              GENERIC_MSI_IRQ = "y";
+              GENERIC_PCI_IOMAP = "y";
+              GENERIC_PHY = "y";
+              GENERIC_PINCONF = "y";
+              GENERIC_PINCTRL_GROUPS = "y";
+              GENERIC_PINMUX_FUNCTIONS = "y";
+              GENERIC_SCHED_CLOCK = "y";
+              GENERIC_SMP_IDLE_THREAD = "y";
+              GENERIC_STRNCPY_FROM_USER = "y";
+              GENERIC_STRNLEN_USER = "y";
+              GENERIC_TIME_VSYSCALL = "y";
+              GLOB = "y";
+              GPIO_CDEV = "y";
+              GPIO_WATCHDOG = "y";
+              GPIO_WATCHDOG_ARCH_INITCALL = "y";
+              GRO_CELLS = "y";
+              HARDIRQS_SW_RESEND = "y";
+              HAS_DMA = "y";
+              HAS_IOMEM = "y";
+              HAS_IOPORT = "y";
+              HAS_IOPORT_MAP = "y";
+              HWMON = "y";
+              HW_RANDOM = "y";
+              HW_RANDOM_MTK = "y";
+              I2C = "y";
+              I2C_BOARDINFO = "y";
+              I2C_CHARDEV = "y";
+              I2C_MT65XX = "y";
+              ICPLUS_PHY = "y";
+              ILLEGAL_POINTER_VALUE = "0xdead000000000000";
+              #INITRAMFS_SOURCE="""";
+              IRQCHIP = "y";
+              IRQ_DOMAIN = "y";
+              IRQ_DOMAIN_HIERARCHY = "y";
+              IRQ_FORCED_THREADING = "y";
+              IRQ_TIME_ACCOUNTING = "y";
+              IRQ_WORK = "y";
+              JBD2 = "y";
+              JUMP_LABEL = "y";
+              LEDS_PWM = "y";
+              LEDS_SMARTRG_LED = "y";
+              LIBFDT = "y";
+              LOCK_DEBUGGING_SUPPORT = "y";
+              LOCK_SPIN_ON_OWNER = "y";
+              LZO_COMPRESS = "y";
+              LZO_DECOMPRESS = "y";
+              MAGIC_SYSRQ = "y";
+              MAXLINEAR_GPHY = "y";
+              MDIO_BUS = "y";
+              MDIO_DEVICE = "y";
+              MDIO_DEVRES = "y";
+              MEDIATEK_2P5GE_PHY = "y";
+              MEDIATEK_GE_PHY = "y";
+              MEDIATEK_GE_SOC_PHY = "y";
+              MEDIATEK_WATCHDOG = "y";
+              MESSAGE_LOGLEVEL_DEFAULT = "7";
+              MFD_SYSCON = "y";
+              MIGRATION = "y";
+              MMC = "y";
+              MMC_BLOCK = "y";
+              MMC_CQHCI = "y";
+              MMC_MTK = "y";
+              MMU_LAZY_TLB_REFCOUNT = "y";
+              MODULES_TREE_LOOKUP = "y";
+              MODULES_USE_ELF_RELA = "y";
+              MTD_NAND_CORE = "y";
+              MTD_NAND_ECC = "y";
+              MTD_NAND_ECC_MEDIATEK = "y";
+              MTD_NAND_ECC_SW_HAMMING = "y";
+              MTD_NAND_MTK = "y";
+              MTD_NAND_MTK_BMT = "y";
+              MTD_PARSER_TRX = "y";
+              MTD_RAW_NAND = "y";
+              MTD_SPI_NAND = "y";
+              MTD_SPI_NOR = "y";
+              MTD_SPLIT_FIRMWARE = "y";
+              MTD_SPLIT_FIT_FW = "y";
+              MTD_UBI = "y";
+              MTD_UBI_BEB_LIMIT = "20";
+              MTD_UBI_BLOCK = "y";
+              MTD_UBI_FASTMAP = "y";
+              MTD_UBI_NVMEM = "y";
+              MTD_UBI_WL_THRESHOLD = "4096";
+              MTK_CPUX_TIMER = "y";
+              MTK_HSDMA = "y";
+              MTK_INFRACFG = "y";
+              MTK_LVTS_THERMAL = "y";
+              MTK_LVTS_THERMAL_DEBUGFS = "y";
+              MTK_PMIC_WRAP = "y";
+              MTK_REGULATOR_COUPLER = "y";
+              MTK_SCPSYS = "y";
+              MTK_SCPSYS_PM_DOMAINS = "y";
+              MTK_SOC_THERMAL = "y";
+              MTK_THERMAL = "y";
+              MTK_TIMER = "y";
+              MUTEX_SPIN_ON_OWNER = "y";
+              NEED_DMA_MAP_STATE = "y";
+              NEED_SG_DMA_LENGTH = "y";
+              NET_DEVLINK = "y";
+              NET_DSA = "y";
+              NET_DSA_MT7530 = "y";
+              NET_DSA_MT7530_MDIO = "y";
+              NET_DSA_MT7530_MMIO = "y";
+              NET_DSA_TAG_MTK = "y";
+              #NET_EGRESS="y";
+              NET_FLOW_LIMIT = "y";
+              #NET_INGRESS="y";
+              NET_MEDIATEK_SOC = "y";
+              NET_MEDIATEK_SOC_WED = "y";
+              NET_SELFTESTS = "y";
+              NET_SWITCHDEV = "y";
+              NET_VENDOR_MEDIATEK = "y";
+              #NET_XGRESS="y";
+              NLS = "y";
+              NO_HZ_COMMON = "y";
+              NO_HZ_IDLE = "y";
+              NR_CPUS = "4";
+              NVMEM = "y";
+              NVMEM_BLOCK = "y";
+              NVMEM_LAYOUTS = "y";
+              NVMEM_LAYOUT_ADTRAN = "y";
+              NVMEM_MTK_EFUSE = "y";
+              NVMEM_SYSFS = "y";
+              OF = "y";
+              OF_ADDRESS = "y";
+              OF_DYNAMIC = "y";
+              OF_EARLY_FLATTREE = "y";
+              OF_FLATTREE = "y";
+              OF_GPIO = "y";
+              OF_IRQ = "y";
+              OF_KOBJ = "y";
+              OF_MDIO = "y";
+              OF_OVERLAY = "y";
+              OF_RESOLVE = "y";
+              PADATA = "y";
+              PAGE_POOL = "y";
+              PAGE_POOL_STATS = "y";
+              PAGE_SIZE_LESS_THAN_256KB = "y";
+              PAGE_SIZE_LESS_THAN_64KB = "y";
+              #PAHOLE_HAS_LANG_EXCLUDE="y";
+              PARTITION_PERCPU = "y";
+              PCI = "y";
+              PCIEAER = "y";
+              PCIEASPM = "y";
+              PCIEASPM_PERFORMANCE = "y";
+              PCIEPORTBUS = "y";
+              PCIE_MEDIATEK_GEN3 = "y";
+              PCIE_PME = "y";
+              PCI_DEBUG = "y";
+              PCI_DOMAINS = "y";
+              PCI_DOMAINS_GENERIC = "y";
+              PCI_MSI = "y";
+              PCS_MTK_LYNXI = "y";
+              PCS_MTK_USXGMII = "y";
+              PERF_EVENTS = "y";
+              PER_VMA_LOCK = "y";
+              PGTABLE_LEVELS = "3";
+              PHYLIB = "y";
+              PHYLIB_LEDS = "y";
+              PHYLINK = "y";
+              PHYS_ADDR_T_64BIT = "y";
+              PHY_MTK_TPHY = "y";
+              PHY_MTK_XFI_TPHY = "y";
+              PHY_MTK_XSPHY = "y";
+              PINCTRL = "y";
+              PINCTRL_MT7981 = "y";
+              PINCTRL_MT7986 = "y";
+              PINCTRL_MT7988 = "y";
+              PINCTRL_MTK_MOORE = "y";
+              PINCTRL_MTK_V2 = "y";
+              PM = "y";
+              PM_CLK = "y";
+              PM_GENERIC_DOMAINS = "y";
+              PM_GENERIC_DOMAINS_OF = "y";
+              PM_OPP = "y";
+              POLYNOMIAL = "y";
+              POSIX_CPU_TIMERS_TASK_WORK = "y";
+              POWER_RESET = "y";
+              POWER_RESET_SYSCON = "y";
+              POWER_SUPPLY = "y";
+              PREEMPT_NONE_BUILD = "y";
+              PRINTK_TIME = "y";
+              PSTORE = "y";
+              PSTORE_COMPRESS = "y";
+              PSTORE_CONSOLE = "y";
+              PSTORE_PMSG = "y";
+              PSTORE_RAM = "y";
+              PTP_1588_CLOCK_OPTIONAL = "y";
+              PWM = "y";
+              PWM_MEDIATEK = "y";
+              PWM_SYSFS = "y";
+              QUEUED_RWLOCKS = "y";
+              QUEUED_SPINLOCKS = "y";
+              RANDSTRUCT_NONE = "y";
+              RAS = "y";
+              RATIONAL = "y";
+              REALTEK_PHY = "y";
+              REED_SOLOMON = "y";
+              REED_SOLOMON_DEC8 = "y";
+              REED_SOLOMON_ENC8 = "y";
+              REGMAP = "y";
+              REGMAP_I2C = "y";
+              REGMAP_MMIO = "y";
+              REGULATOR = "y";
+              REGULATOR_FIXED_VOLTAGE = "y";
+              REGULATOR_MT6380 = "y";
+              REGULATOR_RT5190A = "y";
+              RESET_CONTROLLER = "y";
+              RESET_TI_SYSCON = "y";
+              RFS_ACCEL = "y";
+              RODATA_FULL_DEFAULT_ENABLED = "y";
+              RPS = "y";
+              RTC_CLASS = "y";
+              RTC_DRV_MT7622 = "y";
+              RTC_I2C_AND_SPI = "y";
+              RWSEM_SPIN_ON_OWNER = "y";
+              SCHED_MC = "y";
+              SCSI = "y";
+              SCSI_COMMON = "y";
+              SERIAL_8250_FSL = "y";
+              SERIAL_8250_MT6577 = "y";
+              SERIAL_8250_NR_UARTS = "3";
+              SERIAL_8250_RUNTIME_UARTS = "3";
+              SERIAL_DEV_BUS = "y";
+              SERIAL_DEV_CTRL_TTYPORT = "y";
+              SERIAL_MCTRL_GPIO = "y";
+              SERIAL_OF_PLATFORM = "y";
+              SGL_ALLOC = "y";
+              SG_POOL = "y";
+              SMP = "y";
+              SOCK_RX_QUEUE_MAPPING = "y";
+              SOFTIRQ_ON_OWN_STACK = "y";
+              SPARSEMEM = "y";
+              SPARSEMEM_EXTREME = "y";
+              SPARSEMEM_VMEMMAP = "y";
+              SPARSEMEM_VMEMMAP_ENABLE = "y";
+              SPARSE_IRQ = "y";
+              SPI = "y";
+              SPI_DYNAMIC = "y";
+              SPI_MASTER = "y";
+              SPI_MEM = "y";
+              SPI_MT65XX = "y";
+              SPI_MTK_SNFI = "y";
+              #SQUASHFS_DECOMP_MULTI_PERCPU="y";
+              SWIOTLB = "y";
+              SWPHY = "y";
+              SYSCTL_EXCEPTION_TRACE = "y";
+              THERMAL = "y";
+              THERMAL_DEFAULT_GOV_STEP_WISE = "y";
+              THERMAL_EMERGENCY_POWEROFF_DELAY_MS = "0";
+              THERMAL_GOV_BANG_BANG = "y";
+              THERMAL_GOV_FAIR_SHARE = "y";
+              THERMAL_GOV_STEP_WISE = "y";
+              THERMAL_GOV_USER_SPACE = "y";
+              THERMAL_HWMON = "y";
+              THERMAL_OF = "y";
+              THERMAL_WRITABLE_TRIPS = "y";
+              THREAD_INFO_IN_TASK = "y";
+              TICK_CPU_ACCOUNTING = "y";
+              TIMER_OF = "y";
+              TIMER_PROBE = "y";
+              TRACE_IRQFLAGS_NMI_SUPPORT = "y";
+              TREE_RCU = "y";
+              TREE_SRCU = "y";
+              UBIFS_FS = "y";
+              UIMAGE_FIT_BLK = "y";
+              USB_SUPPORT = "y";
+              VMAP_STACK = "y";
+              WATCHDOG_CORE = "y";
+              WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC = "y";
+              WATCHDOG_PRETIMEOUT_GOV = "y";
+              WATCHDOG_PRETIMEOUT_GOV_PANIC = "y";
+              WATCHDOG_PRETIMEOUT_GOV_SEL = "m";
+              WATCHDOG_SYSFS = "y";
+              XPS = "y";
+              XXHASH = "y";
+              ZLIB_DEFLATE = "y";
+              ZLIB_INFLATE = "y";
+              ZONE_DMA32 = "y";
+              ZSTD_COMMON = "y";
+              ZSTD_COMPRESS = "y";
+              ZSTD_DECOMPRESS = "y";
+              # from DEVICE_PACKAGES in the openwrt_one section of
+              # openwrt's ./target/linux/mediatek/image/filogic.mk:
+              # chop off the 'kmod-' prefix and search for 'KernelPackage/...'
+              # in ./package/kernel/linux/modules/*.mk, and remember to add
+              # modules to kmodloader targets below
+              AIR_EN8811H_PHY = "m";
+              RTC_DRV_PCF8563 = "m";
+              NVME_CORE = "m";
+              BLK_DEV_NVME = "m";
+              NVME_MULTIPATH = "n";
+              NVME_HWMON = "y";
+              # ???
+              AQUANTIA_PHY = "m";
+              MT798X_WMAC = "y";
+            }
+            // lib.optionalAttrs (config.system.service ? watchdog) {
+              RALINK_WDT = "y"; # watchdog
+              MT7621_WDT = "y"; # or it might be this one
+            };
+          conditionalConfig = {
+            WLAN = {
+              MT7915E = "m";
+            };
+          };
+        };
+        boot = {
+          commandLine = [ "console=ttyS0,115200" ];
+          tftp = {
+            # Should be a segment of free RAM, where the tftp artifact
+            # can be stored before unpacking it to the 'hardware.loadAddress'
+            # The 'hardware.loadAddress' is 0x44000000, and the bootlog
+            # suggests it loads the fit to 0x46000000
+            loadAddress = lim.parseInt "0x46000000";
+          };
+          imageFormat = "fit";
+          loader.fit.enable = lib.mkDefault true; # override this if you are building tftpboot
+        };
+        rootfsType = lib.mkDefault "ubifs"; # override this if you are building tftpboot
+        filesystem =
+          let
+            inherit (pkgs.pseudofile) dir symlink;
+          in
+          dir {
+            lib = dir {
+              firmware = dir {
+                mediatek = symlink mediatek-firmware;
+                airoha = symlink airoha-firmware;
+              };
+            };
+          };
+
+        hardware =
+          let
+            phy = pkgs.kmodloader.override {
+              targets = [
+                "air_en8811h"
+              ];
+              inherit (config.system.outputs) kernel;
+            };
+            mac80211 = pkgs.kmodloader.override {
+              targets = [
+                "mt7915e"
+                "rtc-pcf8563"
+                "nvme_core"
+                "nvme"
+                #"mt7996e"
+                "aquantia"
+              ];
+              inherit (config.system.outputs) kernel;
+            };
+          in
+          {
+            # from OEM bootlog
+            # Creating 4 MTD partitions on "spi0.0":
+            # 0x000000000000-0x000000040000 : "bl2-nor"
+            # 0x000000040000-0x000000100000 : "factory"
+            # 0x000000100000-0x000000180000 : "fip-nor"
+            # 0x000000180000-0x000000e00000 : "recovery"
+            # spi-nand spi1.1: calibration result: 0x3
+            # spi-nand spi1.1: Winbond SPI NAND was found.
+            # spi-nand spi1.1: 256 MiB, block size: 128 KiB, page size: 2048, OOB size: 128
+            # 2 fixed-partitions partitions found on MTD device spi1.1
+            # Creating 2 MTD partitions on "spi1.1":
+            # 0x000000000000-0x000000100000 : "bl2"
+            # 0x000000100000-0x000010000000 : "ubi"
+
+            flash = {
+              # from the OEM bootlog:
+              # ## Checking Image at 46000000 ...
+              #   FIT image found
+              #   FIT description: ARM64 OpenWrt FIT (Flattened Image Tree)
+              #    Image 0 (kernel-1)
+              #     Description:  ARM64 OpenWrt Linux-6.6.57
+              #     Type:         Kernel Image
+              #     Compression:  gzip compressed
+              #     Data Start:   0x46001000
+              #     Data Size:    5751840 Bytes = 5.5 MiB
+              #     Architecture: AArch64
+              #     OS:           Linux
+              #     Load Address: 0x44000000
+              #     Entry Point:  0x44000000
+
+              address = lim.parseInt "0x44000000";
+              size = lim.parseInt "0xf60000";
+              # /proc/mtd on a running system:
+              # dev:    size   erasesize  name
+              # mtd0: 00040000 00010000 "bl2-nor"
+              # mtd1: 000c0000 00010000 "factory"
+              # mtd2: 00080000 00010000 "fip-nor"
+              # mtd3: 00c80000 00010000 "recovery"
+              # mtd4: 00100000 00020000 "bl2"
+              # mtd5: 0ff00000 00020000 "ubi"
+              eraseBlockSize = 65536;
+            };
+            ubi = {
+              # TODO taken from belkin-rt3200, to review
+              minIOSize = "2048";
+              logicalEraseBlockSize = "126976";
+              physicalEraseBlockSize = "131072";
+              maxLEBcount = "1024"; # guessing
+            };
+
+            defaultOutput = "ubimage";
+            loadAddress = lim.parseInt "0x44000000";
+            entryPoint = lim.parseInt "0x44000000";
+            # TODO AFAICT this should be 2048, but I got 'FIT: image rootfs-1 start not aligned to page boundaries' with that...
+            #alignment = 2048;
+            alignment = 4096;
+            rootDevice = "ubi0:liminix";
+            dts = {
+              src = "${openwrt.src}/target/linux/mediatek/dts/mt7981b-openwrt-one.dts";
+              includePaths = [
+                "${openwrt.src}/target/linux/mediatek/dts"
+                "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
+              ];
+            };
+
+            networkInterfaces =
+              let
+                inherit (config.system.service.network) link;
+              in
+              rec {
+                eth0 = link.build {
+                  ifname = "eth0";
+                  dependencies = [ phy ];
+                };
+                eth1 = link.build { ifname = "eth1"; };
+
+                wlan0 = link.build {
+                  ifname = "wlan0";
+                  dependencies = [ mac80211 ];
+                };
+                wlan1 = link.build {
+                  ifname = "wlan1";
+                  dependencies = [ mac80211 ];
+                };
+              };
+          };
+      };
+    };
+}

devices/qemu-aarch64/default.nix

@@ -19,33 +19,39 @@
     ARM targets differ from MIPS in that the kernel format expected
     by QEMU is an "Image" (raw binary file) rather than an ELF
     file, but this is taken care of by :command:`run.sh`. Check the
-    documentation for the :ref:`QEMU` (MIPS) target for more information.
+    documentation for the :ref:`qemu` target for more information.
 
   '';
 
   # this device is described by the "qemu" device
   installer = "vmroot";
 
-  module = {pkgs, config, lim, ... }: {
-    imports = [
-      ../../modules/arch/aarch64.nix
-      ../families/qemu.nix
-    ];
-    kernel = {
-      config = {
-        VIRTUALIZATION = "y";
-        PCI_HOST_GENERIC="y";
+  module =
+    { config, lim, ... }:
+    {
+      imports = [
+        ../../modules/arch/aarch64.nix
+        ../families/qemu.nix
+      ];
+      kernel = {
+        config = {
+          VIRTUALIZATION = "y";
+          PCI_HOST_GENERIC = "y";
 
-        SERIAL_AMBA_PL011 = "y";
-        SERIAL_AMBA_PL011_CONSOLE = "y";
+          SERIAL_AMBA_PL011 = "y";
+          SERIAL_AMBA_PL011_CONSOLE = "y";
+        };
       };
+      boot.commandLine = [
+        "console=ttyAMA0,38400"
+      ];
+      hardware =
+        let
+          addr = lim.parseInt "0x40010000";
+        in
+        {
+          loadAddress = addr;
+          entryPoint = addr;
+        };
     };
-    boot.commandLine = [
-      "console=ttyAMA0,38400"
-    ];
-    hardware = let addr = lim.parseInt "0x40010000"; in {
-      loadAddress = addr;
-      entryPoint = addr;
-    };
-  };
 }

devices/qemu-armv7l/default.nix

@@ -5,7 +5,7 @@
 {
   system = {
     crossSystem = {
-      config =  "armv7l-unknown-linux-musleabihf";
+      config = "armv7l-unknown-linux-musleabihf";
     };
   };
 
@@ -24,30 +24,36 @@
   '';
   installer = "vmroot";
 
-  module = {pkgs, config, lim, ... }: {
-    imports = [
-      ../../modules/arch/arm.nix
-      ../families/qemu.nix
-    ];
-    kernel = {
-      config = {
-        PCI_HOST_GENERIC = "y";
-        ARCH_VIRT = "y";
+  module =
+    { config, lim, ... }:
+    {
+      imports = [
+        ../../modules/arch/arm.nix
+        ../families/qemu.nix
+      ];
+      kernel = {
+        config = {
+          PCI_HOST_GENERIC = "y";
+          ARCH_VIRT = "y";
 
-        VFP = "y";
-        NEON = "y";
-        AEABI = "y";
+          VFP = "y";
+          NEON = "y";
+          AEABI = "y";
 
-        SERIAL_AMBA_PL011 = "y";
-        SERIAL_AMBA_PL011_CONSOLE = "y";
+          SERIAL_AMBA_PL011 = "y";
+          SERIAL_AMBA_PL011_CONSOLE = "y";
+        };
       };
+      boot.commandLine = [
+        "console=ttyAMA0"
+      ];
+      hardware =
+        let
+          addr = lim.parseInt "0x40008000";
+        in
+        {
+          loadAddress = addr;
+          entryPoint = addr;
+        };
     };
-    boot.commandLine = [
-      "console=ttyAMA0"
-    ];
-    hardware = let addr = lim.parseInt "0x40008000"; in {
-      loadAddress = addr;
-      entryPoint = addr;
-    };
-  };
 }

devices/qemu/default.nix

@@ -7,7 +7,7 @@
       config = "mips-unknown-linux-musl";
       gcc = {
         abi = "32";
-        arch = "mips32";          # maybe mips_24kc-
+        arch = "mips32"; # maybe mips_24kc-
       };
     };
   };
@@ -36,41 +36,50 @@
     in the Development manual.
 
   '';
-  module = {pkgs, config, lib, lim, ... }: {
-    imports = [
-      ../../modules/arch/mipseb.nix
-      ../families/qemu.nix
-    ];
-    kernel = {
-      config = {
-        MIPS_MALTA= "y";
-        CPU_MIPS32_R2= "y";
+  module =
+    {
+      config,
+      lib,
+      lim,
+      ...
+    }:
+    {
+      imports = [
+        ../../modules/arch/mipseb.nix
+        ../families/qemu.nix
+      ];
+      kernel = {
+        config = {
+          MIPS_MALTA = "y";
+          CPU_MIPS32_R2 = "y";
 
-        POWER_RESET = "y";
-        POWER_RESET_SYSCON = "y";
+          POWER_RESET = "y";
+          POWER_RESET_SYSCON = "y";
 
-        SERIAL_8250= "y";
-        SERIAL_8250_CONSOLE= "y";
-      };
-    };
-    hardware =
-      # from arch/mips/mti-malta/Platform:load-$(CONFIG_MIPS_MALTA)  += 0xffffffff80100000
-      let addr = lim.parseInt "0x80100000";
-      in {
-        loadAddress = addr;
-        entryPoint = addr;
-
-        # Unlike the arm qemu targets, we need a static dts when
-        # running u-boot-using tests, qemu dumpdtb command doesn't
-        # work for this board. I am not at all sure this dts is
-        # *correct* but it does at least boot
-        dts = lib.mkForce {
-          src = "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/mti/malta.dts";
-          includes =  [
-            "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/"
-          ];
+          SERIAL_8250 = "y";
+          SERIAL_8250_CONSOLE = "y";
         };
-
       };
-  };
+      hardware =
+        # from arch/mips/mti-malta/Platform:load-$(CONFIG_MIPS_MALTA)  += 0xffffffff80100000
+        let
+          addr = lim.parseInt "0x80100000";
+        in
+        {
+          loadAddress = addr;
+          entryPoint = addr;
+
+          # Unlike the arm qemu targets, we need a static dts when
+          # running u-boot-using tests, qemu dumpdtb command doesn't
+          # work for this board. I am not at all sure this dts is
+          # *correct* but it does at least boot
+          dts = lib.mkForce {
+            src = "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/mti/malta.dts";
+            includePaths = [
+              "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/"
+            ];
+          };
+
+        };
+    };
 }

devices/tp-archer-ax23/default.nix

@@ -33,16 +33,25 @@
     };
   };
 
-  module = {pkgs, config, lib, lim, ... }:
-    let firmware = pkgs.stdenv.mkDerivation {
-          name = "wlan-firmware";
-          phases = ["installPhase"];
-          installPhase = ''
-            mkdir $out
-            cp ${pkgs.linux-firmware}/lib/firmware/mediatek/{mt7915,mt7615,mt7622}* $out
-          '';
-        };
-    in {
+  module =
+    {
+      pkgs,
+      config,
+      lib,
+      lim,
+      ...
+    }:
+    let
+      firmware = pkgs.stdenv.mkDerivation {
+        name = "wlan-firmware";
+        phases = [ "installPhase" ];
+        installPhase = ''
+          mkdir $out
+          cp ${pkgs.linux-firmware}/lib/firmware/mediatek/{mt7915,mt7615,mt7622}* $out
+        '';
+      };
+    in
+    {
       imports = [
         ../../modules/arch/mipsel.nix
         ../../modules/outputs/tftpboot.nix
@@ -50,281 +59,278 @@
       ];
       config = {
         kernel = {
-          src = pkgs.pkgsBuildBuild.fetchurl {
-            name = "linux.tar.gz";
-            url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
-            hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
-          };
           extraPatchPhase = ''
             ${pkgs.openwrt.applyPatches.ramips}
           '';
-          config = {
-            # Initially taken from openwrt's ./target/linux/ramips/mt7621/config-5.15,
-            # then tweaked here and there
-            ARCH_32BIT_OFF_T="y";
-            ARCH_HIBERNATION_POSSIBLE="y";
-            ARCH_KEEP_MEMBLOCK="y";
-            ARCH_MMAP_RND_BITS_MAX="15";
-            ARCH_MMAP_RND_COMPAT_BITS_MAX="15";
-            ARCH_SUSPEND_POSSIBLE="y";
-            AT803X_PHY="y";
-            BLK_MQ_PCI="y";
-            BOARD_SCACHE="y";
-            CEVT_R4K="y";
-            CLKSRC_MIPS_GIC="y";
-            CLK_MT7621="y";
-            CLOCKSOURCE_WATCHDOG="y";
-            CLONE_BACKWARDS="y";
-            CMDLINE_BOOL="y";
-            COMMON_CLK="y";
-            COMPAT_32BIT_TIME="y";
-            CPU_GENERIC_DUMP_TLB="y";
-            CPU_HAS_DIEI="y";
-            CPU_HAS_PREFETCH="y";
-            CPU_HAS_RIXI="y";
-            CPU_HAS_SYNC="y";
-            CPU_LITTLE_ENDIAN="y";
-            CPU_MIPS32="y";
-            CPU_MIPS32_R2="y";
-            CPU_MIPSR2="y";
-            CPU_MIPSR2_IRQ_EI="y";
-            CPU_MIPSR2_IRQ_VI="y";
-            CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS="y";
-            CPU_R4K_CACHE_TLB="y";
-            CPU_RMAP="y";
-            CPU_SUPPORTS_32BIT_KERNEL="y";
-            CPU_SUPPORTS_HIGHMEM="y";
-            CPU_SUPPORTS_MSA="y";
-            CRC16="y";
-            CRYPTO_DEFLATE="y";
-            CRYPTO_HASH_INFO="y";
-            CRYPTO_LIB_BLAKE2S_GENERIC="y";
-            CRYPTO_LIB_POLY1305_RSIZE="2";
-            CRYPTO_LZO="y";
-            CRYPTO_ZSTD="y";
-            CSRC_R4K="y";
-            DIMLIB="y";
-            DMA_NONCOHERENT="y";
-            DTB_RT_NONE="y";
-            DTC="y";
-            EARLY_PRINTK="y";
-            FIXED_PHY="y";
-            FWNODE_MDIO="y";
-            FW_LOADER_PAGED_BUF="y";
-            GENERIC_ATOMIC64="y";
-            GENERIC_CLOCKEVENTS="y";
-            GENERIC_CMOS_UPDATE="y";
-            GENERIC_CPU_AUTOPROBE="y";
-            GENERIC_FIND_FIRST_BIT="y";
-            GENERIC_GETTIMEOFDAY="y";
-            GENERIC_IOMAP="y";
-            GENERIC_IRQ_CHIP="y";
-            GENERIC_IRQ_EFFECTIVE_AFF_MASK="y";
-            GENERIC_IRQ_SHOW="y";
-            GENERIC_LIB_ASHLDI3="y";
-            GENERIC_LIB_ASHRDI3="y";
-            GENERIC_LIB_CMPDI2="y";
-            GENERIC_LIB_LSHRDI3="y";
-            GENERIC_LIB_UCMPDI2="y";
-            GENERIC_PCI_IOMAP="y";
-            GENERIC_PHY="y";
-            GENERIC_PINCONF="y";
-            GENERIC_SCHED_CLOCK="y";
-            GENERIC_SMP_IDLE_THREAD="y";
-            GENERIC_TIME_VSYSCALL="y";
-            GLOB="y";
-            GPIOLIB_IRQCHIP="y";
-            GPIO_CDEV="y";
-            GPIO_GENERIC="y";
-            GPIO_MT7621="y";
-            GRO_CELLS="y";
-            HANDLE_DOMAIN_IRQ="y";
-            HARDWARE_WATCHPOINTS="y";
-            HAS_DMA="y";
-            HAS_IOMEM="y";
-            HAS_IOPORT_MAP="y";
-            I2C="y";
-            I2C_ALGOBIT="y";
-            I2C_BOARDINFO="y";
-            I2C_CHARDEV="y";
-            I2C_GPIO="y";
-            I2C_MT7621="y";
-            ICPLUS_PHY="y";
-            IRQCHIP="y";
-            IRQ_DOMAIN="y";
-            IRQ_DOMAIN_HIERARCHY="y";
-            IRQ_FORCED_THREADING="y";
-            IRQ_MIPS_CPU="y";
-            IRQ_WORK="y";
-            LIBFDT="y";
-            LOCK_DEBUGGING_SUPPORT="y";
-            LZO_COMPRESS="y";
-            LZO_DECOMPRESS="y";
-            MDIO_BUS="y";
-            MDIO_DEVICE="y";
-            MDIO_DEVRES="y";
-            MEDIATEK_GE_PHY="y";
-            MEMFD_CREATE="y";
-            MFD_SYSCON="y";
-            MIGRATION="y";
-            MIKROTIK="y";
-            MIKROTIK_RB_SYSFS="y";
-            MIPS="y";
-            MIPS_ASID_BITS="8";
-            MIPS_ASID_SHIFT="0";
-            MIPS_CLOCK_VSYSCALL="y";
-            MIPS_CM="y";
-            MIPS_CPC="y";
-            MIPS_CPS="y";
-            MIPS_CPU_SCACHE="y";
-            MIPS_GIC="y";
-            MIPS_L1_CACHE_SHIFT="5";
-            MIPS_LD_CAN_LINK_VDSO="y";
-            MIPS_MT="y";
-            MIPS_MT_FPAFF="y";
-            MIPS_MT_SMP="y";
-            MIPS_NR_CPU_NR_MAP="4";
-            MIPS_PERF_SHARED_TC_COUNTERS="y";
-            MIPS_SPRAM="y";
-            MODULES_USE_ELF_REL="y";
-            MTD_CMDLINE_PARTS="y";
-            MTD_NAND_CORE="y";
-            MTD_NAND_ECC="y";
-            MTD_NAND_ECC_SW_HAMMING="y";
-            MTD_NAND_MT7621="y";
-            MTD_NAND_MTK_BMT="y";
-            MTD_RAW_NAND="y";
-            MTD_ROUTERBOOT_PARTS="y";
-            MTD_SERCOMM_PARTS="y";
-            MTD_SPI_NOR="y";
-            MTD_SPLIT_FIT_FW="y";
-            MTD_SPLIT_MINOR_FW="y";
-            MTD_SPLIT_SEAMA_FW="y";
-            MTD_SPLIT_TPLINK_FW="y";
-            MTD_SPLIT_TRX_FW="y";
-            MTD_SPLIT_UIMAGE_FW="y";
-            MTD_UBI="y";
-            MTD_UBI_BEB_LIMIT="20";
-            MTD_UBI_BLOCK="y";
-            MTD_UBI_WL_THRESHOLD="4096";
-            MTD_VIRT_CONCAT="y";
-            NEED_DMA_MAP_STATE="y";
-            NET_DEVLINK="y";
-            NET_DSA="y";
-            NET_DSA_MT7530="y";
-            NET_DSA_MT7530_MDIO="y";
-            NET_DSA_TAG_MTK="y";
-            NET_FLOW_LIMIT="y";
-            NET_MEDIATEK_SOC="y";
-            NET_SELFTESTS="y";
-            NET_SWITCHDEV="y";
-            NET_VENDOR_MEDIATEK="y";
-            NO_HZ_COMMON="y";
-            NO_HZ_IDLE="y";
-            NR_CPUS="4";
-            NVMEM="y";
-            OF="y";
-            OF_ADDRESS="y";
-            OF_EARLY_FLATTREE="y";
-            OF_FLATTREE="y";
-            OF_GPIO="y";
-            OF_IRQ="y";
-            OF_KOBJ="y";
-            OF_MDIO="y";
-            PAGE_POOL="y";
-            PAGE_POOL_STATS="y";
-            PCI="y";
-            PCIE_MT7621="y";
-            PCI_DISABLE_COMMON_QUIRKS="y";
-            PCI_DOMAINS="y";
-            PCI_DOMAINS_GENERIC="y";
-            PCI_DRIVERS_GENERIC="y";
-            PCS_MTK_LYNXI="y";
-            PERF_USE_VMALLOC="y";
-            PGTABLE_LEVELS="2";
-            PHYLIB="y";
-            PHYLINK="y";
-            PHY_MT7621_PCI="y";
-            PINCTRL="y";
-            PINCTRL_AW9523="y";
-            PINCTRL_MT7621="y";
-            PINCTRL_RALINK="y";
-            PINCTRL_SX150X="y";
-            POWER_RESET="y";
-            POWER_RESET_GPIO="y";
-            POWER_SUPPLY="y";
-            PTP_1588_CLOCK_OPTIONAL="y";
-            QUEUED_RWLOCKS="y";
-            QUEUED_SPINLOCKS="y";
-            RALINK="y";
-            RATIONAL="y";
-            REGMAP="y";
-            REGMAP_I2C="y";
-            REGMAP_MMIO="y";
-            REGULATOR="y";
-            REGULATOR_FIXED_VOLTAGE="y";
-            RESET_CONTROLLER="y";
-            RFS_ACCEL="y";
-            RPS="y";
-            RTC_CLASS="y";
-            RTC_DRV_BQ32K="y";
-            RTC_DRV_PCF8563="y";
-            RTC_I2C_AND_SPI="y";
-            SCHED_SMT="y";
-            SERIAL_8250="y";
-            SERIAL_8250_CONSOLE="y";
-            SERIAL_8250_NR_UARTS="3";
-            SERIAL_8250_RUNTIME_UARTS="3";
-            SERIAL_MCTRL_GPIO="y";
-            SERIAL_OF_PLATFORM="y";
-            SGL_ALLOC="y";
-            SMP="y";
-            SMP_UP="y";
-            SOCK_RX_QUEUE_MAPPING="y";
-            SOC_BUS="y";
-            SOC_MT7621="y";
-            SPI="y";
-            SPI_MASTER="y";
-            SPI_MEM="y";
-            SPI_MT7621="y";
-            SRCU="y";
-            SWPHY="y";
-            SYNC_R4K="y";
-            SYSCTL_EXCEPTION_TRACE="y";
-            SYS_HAS_CPU_MIPS32_R1="y";
-            SYS_HAS_CPU_MIPS32_R2="y";
-            SYS_HAS_EARLY_PRINTK="y";
-            SYS_SUPPORTS_32BIT_KERNEL="y";
-            SYS_SUPPORTS_ARBIT_HZ="y";
-            SYS_SUPPORTS_HIGHMEM="y";
-            SYS_SUPPORTS_HOTPLUG_CPU="y";
-            SYS_SUPPORTS_LITTLE_ENDIAN="y";
-            SYS_SUPPORTS_MIPS16="y";
-            SYS_SUPPORTS_MIPS_CPS="y";
-            SYS_SUPPORTS_MULTITHREADING="y";
-            SYS_SUPPORTS_SCHED_SMT="y";
-            SYS_SUPPORTS_SMP="y";
-            SYS_SUPPORTS_ZBOOT="y";
-            TARGET_ISA_REV="2";
-            TICK_CPU_ACCOUNTING="y";
-            TIMER_OF="y";
-            TIMER_PROBE="y";
-            TREE_RCU="y";
-            TREE_SRCU="y";
-            UBIFS_FS="y";
-            USB_SUPPORT="y";
-            USE_OF="y";
-            WEAK_ORDERING="y";
-            XPS="y";
-            XXHASH="y";
-            ZLIB_DEFLATE="y";
-            ZLIB_INFLATE="y";
-            ZSTD_COMPRESS="y";
-            ZSTD_DECOMPRESS="y";
-          } // lib.optionalAttrs (config.system.service ? watchdog) {
-            RALINK_WDT = "y";  # watchdog
-            MT7621_WDT = "y";  # or it might be this one
-          };
+          config =
+            {
+              # Initially taken from openwrt's ./target/linux/ramips/mt7621/config-5.15,
+              # then tweaked here and there
+              ARCH_32BIT_OFF_T = "y";
+              ARCH_HIBERNATION_POSSIBLE = "y";
+              ARCH_KEEP_MEMBLOCK = "y";
+              ARCH_MMAP_RND_BITS_MAX = "15";
+              ARCH_MMAP_RND_COMPAT_BITS_MAX = "15";
+              ARCH_SUSPEND_POSSIBLE = "y";
+              AT803X_PHY = "y";
+              BLK_MQ_PCI = "y";
+              BOARD_SCACHE = "y";
+              CEVT_R4K = "y";
+              CLKSRC_MIPS_GIC = "y";
+              CLK_MT7621 = "y";
+              CLOCKSOURCE_WATCHDOG = "y";
+              CLONE_BACKWARDS = "y";
+              CMDLINE_BOOL = "y";
+              COMMON_CLK = "y";
+              COMPAT_32BIT_TIME = "y";
+              CPU_GENERIC_DUMP_TLB = "y";
+              CPU_HAS_DIEI = "y";
+              CPU_HAS_PREFETCH = "y";
+              CPU_HAS_RIXI = "y";
+              CPU_HAS_SYNC = "y";
+              CPU_LITTLE_ENDIAN = "y";
+              CPU_MIPS32 = "y";
+              CPU_MIPS32_R2 = "y";
+              CPU_MIPSR2 = "y";
+              CPU_MIPSR2_IRQ_EI = "y";
+              CPU_MIPSR2_IRQ_VI = "y";
+              CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS = "y";
+              CPU_R4K_CACHE_TLB = "y";
+              CPU_RMAP = "y";
+              CPU_SUPPORTS_32BIT_KERNEL = "y";
+              CPU_SUPPORTS_HIGHMEM = "y";
+              CPU_SUPPORTS_MSA = "y";
+              CRC16 = "y";
+              CRYPTO_DEFLATE = "y";
+              CRYPTO_HASH_INFO = "y";
+              CRYPTO_LIB_BLAKE2S_GENERIC = "y";
+              CRYPTO_LIB_POLY1305_RSIZE = "2";
+              CRYPTO_LZO = "y";
+              CRYPTO_ZSTD = "y";
+              CSRC_R4K = "y";
+              DIMLIB = "y";
+              DMA_NONCOHERENT = "y";
+              DTB_RT_NONE = "y";
+              DTC = "y";
+              EARLY_PRINTK = "y";
+              FIXED_PHY = "y";
+              FWNODE_MDIO = "y";
+              FW_LOADER_PAGED_BUF = "y";
+              GENERIC_ATOMIC64 = "y";
+              GENERIC_CLOCKEVENTS = "y";
+              GENERIC_CMOS_UPDATE = "y";
+              GENERIC_CPU_AUTOPROBE = "y";
+              GENERIC_FIND_FIRST_BIT = "y";
+              GENERIC_GETTIMEOFDAY = "y";
+              GENERIC_IOMAP = "y";
+              GENERIC_IRQ_CHIP = "y";
+              GENERIC_IRQ_EFFECTIVE_AFF_MASK = "y";
+              GENERIC_IRQ_SHOW = "y";
+              GENERIC_LIB_ASHLDI3 = "y";
+              GENERIC_LIB_ASHRDI3 = "y";
+              GENERIC_LIB_CMPDI2 = "y";
+              GENERIC_LIB_LSHRDI3 = "y";
+              GENERIC_LIB_UCMPDI2 = "y";
+              GENERIC_PCI_IOMAP = "y";
+              GENERIC_PHY = "y";
+              GENERIC_PINCONF = "y";
+              GENERIC_SCHED_CLOCK = "y";
+              GENERIC_SMP_IDLE_THREAD = "y";
+              GENERIC_TIME_VSYSCALL = "y";
+              GLOB = "y";
+              GPIOLIB_IRQCHIP = "y";
+              GPIO_CDEV = "y";
+              GPIO_GENERIC = "y";
+              GPIO_MT7621 = "y";
+              GRO_CELLS = "y";
+              HANDLE_DOMAIN_IRQ = "y";
+              HARDWARE_WATCHPOINTS = "y";
+              HAS_DMA = "y";
+              HAS_IOMEM = "y";
+              HAS_IOPORT_MAP = "y";
+              I2C = "y";
+              I2C_ALGOBIT = "y";
+              I2C_BOARDINFO = "y";
+              I2C_CHARDEV = "y";
+              I2C_GPIO = "y";
+              I2C_MT7621 = "y";
+              ICPLUS_PHY = "y";
+              IRQCHIP = "y";
+              IRQ_DOMAIN = "y";
+              IRQ_DOMAIN_HIERARCHY = "y";
+              IRQ_FORCED_THREADING = "y";
+              IRQ_MIPS_CPU = "y";
+              IRQ_WORK = "y";
+              LIBFDT = "y";
+              LOCK_DEBUGGING_SUPPORT = "y";
+              LZO_COMPRESS = "y";
+              LZO_DECOMPRESS = "y";
+              MDIO_BUS = "y";
+              MDIO_DEVICE = "y";
+              MDIO_DEVRES = "y";
+              MEDIATEK_GE_PHY = "y";
+              MEMFD_CREATE = "y";
+              MFD_SYSCON = "y";
+              MIGRATION = "y";
+              MIKROTIK = "y";
+              MIKROTIK_RB_SYSFS = "y";
+              MIPS = "y";
+              MIPS_ASID_BITS = "8";
+              MIPS_ASID_SHIFT = "0";
+              MIPS_CLOCK_VSYSCALL = "y";
+              MIPS_CM = "y";
+              MIPS_CPC = "y";
+              MIPS_CPS = "y";
+              MIPS_CPU_SCACHE = "y";
+              MIPS_GIC = "y";
+              MIPS_L1_CACHE_SHIFT = "5";
+              MIPS_LD_CAN_LINK_VDSO = "y";
+              MIPS_MT = "y";
+              MIPS_MT_FPAFF = "y";
+              MIPS_MT_SMP = "y";
+              MIPS_NR_CPU_NR_MAP = "4";
+              MIPS_PERF_SHARED_TC_COUNTERS = "y";
+              MIPS_SPRAM = "y";
+              MODULES_USE_ELF_REL = "y";
+              MTD_CMDLINE_PARTS = "y";
+              MTD_NAND_CORE = "y";
+              MTD_NAND_ECC = "y";
+              MTD_NAND_ECC_SW_HAMMING = "y";
+              MTD_NAND_MT7621 = "y";
+              MTD_NAND_MTK_BMT = "y";
+              MTD_RAW_NAND = "y";
+              MTD_ROUTERBOOT_PARTS = "y";
+              MTD_SERCOMM_PARTS = "y";
+              MTD_SPI_NOR = "y";
+              MTD_SPLIT_FIT_FW = "y";
+              MTD_SPLIT_MINOR_FW = "y";
+              MTD_SPLIT_SEAMA_FW = "y";
+              MTD_SPLIT_TPLINK_FW = "y";
+              MTD_SPLIT_TRX_FW = "y";
+              MTD_SPLIT_UIMAGE_FW = "y";
+              MTD_UBI = "y";
+              MTD_UBI_BEB_LIMIT = "20";
+              MTD_UBI_BLOCK = "y";
+              MTD_UBI_WL_THRESHOLD = "4096";
+              MTD_VIRT_CONCAT = "y";
+              NEED_DMA_MAP_STATE = "y";
+              NET_DEVLINK = "y";
+              NET_DSA = "y";
+              NET_DSA_MT7530 = "y";
+              NET_DSA_MT7530_MDIO = "y";
+              NET_DSA_TAG_MTK = "y";
+              NET_FLOW_LIMIT = "y";
+              NET_MEDIATEK_SOC = "y";
+              NET_SELFTESTS = "y";
+              NET_SWITCHDEV = "y";
+              NET_VENDOR_MEDIATEK = "y";
+              NO_HZ_COMMON = "y";
+              NO_HZ_IDLE = "y";
+              NR_CPUS = "4";
+              NVMEM = "y";
+              OF = "y";
+              OF_ADDRESS = "y";
+              OF_EARLY_FLATTREE = "y";
+              OF_FLATTREE = "y";
+              OF_GPIO = "y";
+              OF_IRQ = "y";
+              OF_KOBJ = "y";
+              OF_MDIO = "y";
+              PAGE_POOL = "y";
+              PAGE_POOL_STATS = "y";
+              PCI = "y";
+              PCIE_MT7621 = "y";
+              PCI_DISABLE_COMMON_QUIRKS = "y";
+              PCI_DOMAINS = "y";
+              PCI_DOMAINS_GENERIC = "y";
+              PCI_DRIVERS_GENERIC = "y";
+              PCS_MTK_LYNXI = "y";
+              PERF_USE_VMALLOC = "y";
+              PGTABLE_LEVELS = "2";
+              PHYLIB = "y";
+              PHYLINK = "y";
+              PHY_MT7621_PCI = "y";
+              PINCTRL = "y";
+              PINCTRL_AW9523 = "y";
+              PINCTRL_MT7621 = "y";
+              PINCTRL_RALINK = "y";
+              PINCTRL_SX150X = "y";
+              POWER_RESET = "y";
+              POWER_RESET_GPIO = "y";
+              POWER_SUPPLY = "y";
+              PTP_1588_CLOCK_OPTIONAL = "y";
+              QUEUED_RWLOCKS = "y";
+              QUEUED_SPINLOCKS = "y";
+              RALINK = "y";
+              RATIONAL = "y";
+              REGMAP = "y";
+              REGMAP_I2C = "y";
+              REGMAP_MMIO = "y";
+              REGULATOR = "y";
+              REGULATOR_FIXED_VOLTAGE = "y";
+              RESET_CONTROLLER = "y";
+              RFS_ACCEL = "y";
+              RPS = "y";
+              RTC_CLASS = "y";
+              RTC_DRV_BQ32K = "y";
+              RTC_DRV_PCF8563 = "y";
+              RTC_I2C_AND_SPI = "y";
+              SCHED_SMT = "y";
+              SERIAL_8250 = "y";
+              SERIAL_8250_CONSOLE = "y";
+              SERIAL_8250_NR_UARTS = "3";
+              SERIAL_8250_RUNTIME_UARTS = "3";
+              SERIAL_MCTRL_GPIO = "y";
+              SERIAL_OF_PLATFORM = "y";
+              SGL_ALLOC = "y";
+              SMP = "y";
+              SMP_UP = "y";
+              SOCK_RX_QUEUE_MAPPING = "y";
+              SOC_BUS = "y";
+              SOC_MT7621 = "y";
+              SPI = "y";
+              SPI_MASTER = "y";
+              SPI_MEM = "y";
+              SPI_MT7621 = "y";
+              SRCU = "y";
+              SWPHY = "y";
+              SYNC_R4K = "y";
+              SYSCTL_EXCEPTION_TRACE = "y";
+              SYS_HAS_CPU_MIPS32_R1 = "y";
+              SYS_HAS_CPU_MIPS32_R2 = "y";
+              SYS_HAS_EARLY_PRINTK = "y";
+              SYS_SUPPORTS_32BIT_KERNEL = "y";
+              SYS_SUPPORTS_ARBIT_HZ = "y";
+              SYS_SUPPORTS_HIGHMEM = "y";
+              SYS_SUPPORTS_HOTPLUG_CPU = "y";
+              SYS_SUPPORTS_LITTLE_ENDIAN = "y";
+              SYS_SUPPORTS_MIPS16 = "y";
+              SYS_SUPPORTS_MIPS_CPS = "y";
+              SYS_SUPPORTS_MULTITHREADING = "y";
+              SYS_SUPPORTS_SCHED_SMT = "y";
+              SYS_SUPPORTS_SMP = "y";
+              SYS_SUPPORTS_ZBOOT = "y";
+              TARGET_ISA_REV = "2";
+              TICK_CPU_ACCOUNTING = "y";
+              TIMER_OF = "y";
+              TIMER_PROBE = "y";
+              TREE_RCU = "y";
+              TREE_SRCU = "y";
+              UBIFS_FS = "y";
+              USB_SUPPORT = "y";
+              USE_OF = "y";
+              WEAK_ORDERING = "y";
+              XPS = "y";
+              XXHASH = "y";
+              ZLIB_DEFLATE = "y";
+              ZLIB_INFLATE = "y";
+              ZSTD_COMPRESS = "y";
+              ZSTD_DECOMPRESS = "y";
+            }
+            // lib.optionalAttrs (config.system.service ? watchdog) {
+              RALINK_WDT = "y"; # watchdog
+              MT7621_WDT = "y"; # or it might be this one
+            };
           conditionalConfig = {
             WLAN = {
               MT7915E = "m";
@@ -345,98 +351,100 @@
           };
         };
         filesystem =
-        let inherit (pkgs.pseudofile) dir symlink;
-             in
-               dir {
-                 lib = dir {
-                   firmware = dir {
-                     mediatek = symlink firmware;
-                   };
-                 };
-               };
-
-      hardware =
-        let
-          openwrt = pkgs.openwrt;
-          mac80211 =  pkgs.kmodloader.override {
-            targets = [
-              "mt7915e"
-            ];
-            inherit (config.system.outputs) kernel;
-          };
-        in {
-          # from OEM bootlog (openwrt wiki):
-          # 4 cmdlinepart partitions found on MTD device raspi
-          # Creating 4 MTD partitions on "raspi":
-          # 0x000000000000-0x000000040000 : "uboot"
-          # 0x000000040000-0x000000440000 : "uImage"
-          # 0x000000440000-0x000000ff0000 : "rootfs"
-          # 0x000000ff0000-0x000001000000 : "ART"
-          # from openwrt bootlog (openwrt wiki):
-          # 5 fixed-partitions partitions found on MTD device spi0.0
-          # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
-          # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
-          # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
-          # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
-          # Creating 5 MTD partitions on "spi0.0":
-          # 0x000000000000-0x000000040000 : "u-boot"
-          # 0x000000040000-0x000000fa0000 : "firmware"
-          # 2 uimage-fw partitions found on MTD device firmware
-          # Creating 2 MTD partitions on "firmware":
-          # 0x000000000000-0x0000002c0000 : "kernel"
-          # 0x0000002c0000-0x000000f60000 : "rootfs"
-          # mtd: setting mtd3 (rootfs) as root device
-          # 1 squashfs-split partitions found on MTD device rootfs
-          # 0x000000640000-0x000000f60000 : "rootfs_data"
-          # 0x000000fa0000-0x000000fb0000 : "config"
-          # 0x000000fb0000-0x000000ff0000 : "tplink"
-          # 0x000000ff0000-0x000001000000 : "radio"
-          flash = {
-            # from the OEM bootlog 'Booting image at bc040000'
-            # (0x40000 from 0xbc000000)
-            address = lim.parseInt "0xbc040000";
-            # 0x000000040000-0x000000fa0000
-            size = lim.parseInt "0xf60000";
-            # TODO: find in /proc/mtd on a running system
-            eraseBlockSize = 65536;
-          };
-
-          # since this is mentioned in the partition table as well?
-          defaultOutput = "tplink-safeloader";
-          # taken from openwrt sysupgrade image:
-          # openwrt-23.05.2-ramips-mt7621-tplink_archer-ax23-v1-squashfs-sysupgrade.bin: u-boot legacy uImage, MIPS OpenWrt Linux-5.15.137, Linux/MIPS, OS Kernel Image (lzma), 2797386 bytes, Tue Nov 14 13:38:11 2023, Load Address: 0X80001000, Entry Point: 0X80001000, Header CRC: 0X19F74C5B, Data CRC: 0XF685563C
-          loadAddress = lim.parseInt "0x80001000";
-          entryPoint = lim.parseInt "0x80001000";
-          rootDevice = "/dev/mtdblock3";
-          dts = {
-            src = "${openwrt.src}/target/linux/ramips/dts/mt7621_tplink_archer-ax23-v1.dts";
-            includes =  [
-              "${openwrt.src}/target/linux/ramips/dts"
-              "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
-            ];
-          };
-
-          networkInterfaces =
-            let
-              inherit (config.system.service.network) link;
-              inherit (config.system.service) bridge;
-            in rec {
-              lan1 = link.build { ifname = "lan1"; };
-              lan2 = link.build { ifname = "lan2"; };
-              lan3 = link.build { ifname = "lan3"; };
-              lan4 = link.build { ifname = "lan4"; };
-              wan = link.build { ifname = "wan"; };
-
-              wlan = link.build {
-                ifname = "wlan0";
-                dependencies = [ mac80211 ];
-              };
-              wlan5 = link.build {
-                ifname = "wlan1";
-                dependencies = [ mac80211 ];
+          let
+            inherit (pkgs.pseudofile) dir symlink;
+          in
+          dir {
+            lib = dir {
+              firmware = dir {
+                mediatek = symlink firmware;
               };
             };
-        };
-    };
+          };
+
+        hardware =
+          let
+            openwrt = pkgs.openwrt;
+            mac80211 = pkgs.kmodloader.override {
+              targets = [
+                "mt7915e"
+              ];
+              inherit (config.system.outputs) kernel;
+            };
+          in
+          {
+            # from OEM bootlog (openwrt wiki):
+            # 4 cmdlinepart partitions found on MTD device raspi
+            # Creating 4 MTD partitions on "raspi":
+            # 0x000000000000-0x000000040000 : "uboot"
+            # 0x000000040000-0x000000440000 : "uImage"
+            # 0x000000440000-0x000000ff0000 : "rootfs"
+            # 0x000000ff0000-0x000001000000 : "ART"
+            # from openwrt bootlog (openwrt wiki):
+            # 5 fixed-partitions partitions found on MTD device spi0.0
+            # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
+            # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
+            # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
+            # OF: Bad cell count for /palmbus@1e000000/spi@b00/flash@0/partitions
+            # Creating 5 MTD partitions on "spi0.0":
+            # 0x000000000000-0x000000040000 : "u-boot"
+            # 0x000000040000-0x000000fa0000 : "firmware"
+            # 2 uimage-fw partitions found on MTD device firmware
+            # Creating 2 MTD partitions on "firmware":
+            # 0x000000000000-0x0000002c0000 : "kernel"
+            # 0x0000002c0000-0x000000f60000 : "rootfs"
+            # mtd: setting mtd3 (rootfs) as root device
+            # 1 squashfs-split partitions found on MTD device rootfs
+            # 0x000000640000-0x000000f60000 : "rootfs_data"
+            # 0x000000fa0000-0x000000fb0000 : "config"
+            # 0x000000fb0000-0x000000ff0000 : "tplink"
+            # 0x000000ff0000-0x000001000000 : "radio"
+            flash = {
+              # from the OEM bootlog 'Booting image at bc040000'
+              # (0x40000 from 0xbc000000)
+              address = lim.parseInt "0xbc040000";
+              # 0x000000040000-0x000000fa0000
+              size = lim.parseInt "0xf60000";
+              # TODO: find in /proc/mtd on a running system
+              eraseBlockSize = 65536;
+            };
+
+            # since this is mentioned in the partition table as well?
+            defaultOutput = "tplink-safeloader";
+            # taken from openwrt sysupgrade image:
+            # openwrt-23.05.2-ramips-mt7621-tplink_archer-ax23-v1-squashfs-sysupgrade.bin: u-boot legacy uImage, MIPS OpenWrt Linux-5.15.137, Linux/MIPS, OS Kernel Image (lzma), 2797386 bytes, Tue Nov 14 13:38:11 2023, Load Address: 0X80001000, Entry Point: 0X80001000, Header CRC: 0X19F74C5B, Data CRC: 0XF685563C
+            loadAddress = lim.parseInt "0x80001000";
+            entryPoint = lim.parseInt "0x80001000";
+            rootDevice = "/dev/mtdblock3";
+            dts = {
+              src = "${openwrt.src}/target/linux/ramips/dts/mt7621_tplink_archer-ax23-v1.dts";
+              includePaths = [
+                "${openwrt.src}/target/linux/ramips/dts"
+                "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
+              ];
+            };
+
+            networkInterfaces =
+              let
+                inherit (config.system.service.network) link;
+              in
+              rec {
+                lan1 = link.build { ifname = "lan1"; };
+                lan2 = link.build { ifname = "lan2"; };
+                lan3 = link.build { ifname = "lan3"; };
+                lan4 = link.build { ifname = "lan4"; };
+                wan = link.build { ifname = "wan"; };
+
+                wlan = link.build {
+                  ifname = "wlan0";
+                  dependencies = [ mac80211 ];
+                };
+                wlan5 = link.build {
+                  ifname = "wlan1";
+                  dependencies = [ mac80211 ];
+                };
+              };
+          };
+      };
     };
 }

devices/turris-omnia/default.nix

@@ -153,13 +153,18 @@
     };
   };
 
-  module = {pkgs, config, lib, lim, ... }:
+  module =
+    {
+      pkgs,
+      config,
+      lib,
+      lim,
+      ...
+    }:
     let
-      openwrt = pkgs.openwrt;
-      inherit (lib) mkOption types;
       inherit (pkgs.liminix.services) oneshot;
       inherit (pkgs) liminix;
-      mtd_by_name_links = pkgs.liminix.services.oneshot rec  {
+      mtd_by_name_links = pkgs.liminix.services.oneshot rec {
         name = "mtd_by_name_links";
         up = ''
           mkdir -p /dev/mtd/by-name
@@ -169,15 +174,18 @@
           done
         '';
       };
-    in {
+    in
+    {
       imports = [
         ../../modules/arch/arm.nix
         ../../modules/outputs/tftpboot.nix
         ../../modules/outputs/mbrimage.nix
-        ../../modules/outputs/extlinux.nix
       ];
 
       config = {
+        rootfsType = lib.mkDefault "btrfs"; # override this if you are building tftpboot
+        rootOptions = lib.mkDefault "subvol=@";
+
         services.mtd-name-links = mtd_by_name_links;
         kernel = {
           src = pkgs.pkgsBuildBuild.fetchurl {
@@ -194,7 +202,7 @@
             CPU_V7 = "y";
             ARCH_MULTIPLATFORM = "y";
             ARCH_MVEBU = "y";
-            ARCH_MULTI_V7= "y";
+            ARCH_MULTI_V7 = "y";
             PCI_MVEBU = "y";
             AHCI_MVEBU = "y";
 
@@ -204,7 +212,6 @@
             EXPERT = "y";
             ALLOW_DEV_COREDUMP = "n";
 
-
             # dts has a compatible for this but dmesg is not
             # showing it
             EEPROM_AT24 = "y"; # atmel,24c64
@@ -215,49 +222,44 @@
 
             MACH_ARMADA_38X = "y";
             SMP = "y";
-	          # this is disabled for the moment because it relies on a
+            # this is disabled for the moment because it relies on a
             # GCC plugin that requires gmp.h to build, and I can't see
             # right now how to confgure it to find gmp
             STACKPROTECTOR_PER_TASK = "n";
             NR_CPUS = "4";
             VFP = "y";
-            NEON= "y";
+            NEON = "y";
 
             # WARNING: unmet direct dependencies detected for ARCH_WANT_LIBATA_LEDS
             ATA = "y";
 
-            PSTORE = "y";
-            PSTORE_RAM = "y";
-            PSTORE_CONSOLE = "y";
-#            PSTORE_DEFLATE_COMPRESS = "n";
-
             BLOCK = "y";
-            MMC="y";
-            PWRSEQ_EMMC="y";        # ???
-            PWRSEQ_SIMPLE="y";      # ???
-            MMC_BLOCK="y";
+            MMC = "y";
+            PWRSEQ_EMMC = "y"; # ???
+            PWRSEQ_SIMPLE = "y"; # ???
+            MMC_BLOCK = "y";
 
-            MMC_SDHCI= "y";
-            MMC_SDHCI_PLTFM= "y";
-            MMC_SDHCI_PXAV3= "y";