aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/turris-mox-support.nix3
-rw-r--r--nixos/modules/turris-omnia-support.nix10
2 files changed, 10 insertions, 3 deletions
diff --git a/nixos/modules/turris-mox-support.nix b/nixos/modules/turris-mox-support.nix
index b12f511..5b3d17f 100644
--- a/nixos/modules/turris-mox-support.nix
+++ b/nixos/modules/turris-mox-support.nix
@@ -16,6 +16,9 @@ with lib;
"armada_37xx_wdt"
"moxtet" "gpio-moxtet" "turris-mox-rwtm"
];
+ # Explicitly set device tree to ensure we load the correct one.
+ # This fixes boot with some U-Boot versions.
+ hardware.deviceTree.name = "marvell/armada-3720-turris-mox.dtb";
# Systemd seems to not handling hardware watchdog for some reason
systemd.services."nowatchdog" = {
diff --git a/nixos/modules/turris-omnia-support.nix b/nixos/modules/turris-omnia-support.nix
index 8fb8344..9a59212 100644
--- a/nixos/modules/turris-omnia-support.nix
+++ b/nixos/modules/turris-omnia-support.nix
@@ -11,9 +11,13 @@ with lib;
];
# Force load of Turris Omnia leds (not loadded automatically for some
# reason).
- boot.kernelModules = [
- "leds_turris_omnia"
- ];
+ #boot.kernelModules = [
+ # "leds_turris_omnia"
+ #];
+ # Blacklist leds for now as they cause kernel faults
+ boot.blacklistedKernelModules = ["leds_turris_omnia"];
+ # Explicitly set device tree to ensure we load the correct one.
+ hardware.deviceTree.name = "armada-385-turris-omnia.dtb";
# The additional administration packages
environment.systemPackages = with pkgs; [