From e60f961c1da0bf460d84a5f50c6218378104ec17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 21 Oct 2022 15:03:24 +0200
Subject: nixos: force watchdog and moxtet load in initrd

---
 nixos/modules/turris-mox-support.nix | 8 +++++++-
 pkgs/mox-otp/default.nix             | 5 ++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/turris-mox-support.nix b/nixos/modules/turris-mox-support.nix
index 578e467..c3fd508 100644
--- a/nixos/modules/turris-mox-support.nix
+++ b/nixos/modules/turris-mox-support.nix
@@ -10,10 +10,16 @@ with lib;
       "earlycon=ar3700_uart,0xd0012000" "console=ttyMV0,115200"
       "pcie_aspm=off" # Fix for crashes due to SError Interrupt on ath10k load
     ];
+    # Insert these modules early. The watchdog should be handled as soon as
+    # possible and moxtet is for some reason ignored otherwise.
+    boot.initrd.kernelModules = [
+      "armada_37xx_wdt"
+      "moxtet" "gpio-moxtet" "turris-mox-rwtm"
+    ];
 
     # The additional administration packages
     environment.systemPackages =  with pkgs; [
-      #mox-otp
+      mox-otp
     ];
 
   };
diff --git a/pkgs/mox-otp/default.nix b/pkgs/mox-otp/default.nix
index d0ccc4d..335e5a4 100644
--- a/pkgs/mox-otp/default.nix
+++ b/pkgs/mox-otp/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonApplication rec {
   pname = "mox-otp";
-  version = "0.3.1-pre0";
+  version = "0.3.1";
   meta = with lib; {
     homepage = "https://gitlab.nic.cz/turris/mox-otp";
     description = "Command line tool to query MOX CPU read-only OTP device";
@@ -14,8 +14,7 @@ buildPythonApplication rec {
 
   src = fetchgit {
     url = "https://gitlab.nic.cz/turris/mox-otp.git";
-    rev = "ac3c4ae89d3d7e7ca2c4cc1ad97cdbc9936a1026";
-    #rev = "v" + version;
+    rev = "v" + version;
     sha256 = "0sknaqv7aga99x99mh5gvinx3fc4rl9pyaq8j71nmhblf50cfwk4";
   };
 }
-- 
cgit v1.2.3