diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-10-24 19:46:03 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-10-24 19:46:03 +0200 |
| commit | e0470d0a5bc6d5cd5cdc3a5b515d12f3594d3ec2 (patch) | |
| tree | 949120fa65fc8878f04e56e4760b7b43f2294394 | |
| parent | fc435c8d4ed77f2949d944f037a876b7043bcac5 (diff) | |
| download | nixturris-e0470d0a5bc6d5cd5cdc3a5b515d12f3594d3ec2.tar.gz nixturris-e0470d0a5bc6d5cd5cdc3a5b515d12f3594d3ec2.tar.bz2 nixturris-e0470d0a5bc6d5cd5cdc3a5b515d12f3594d3ec2.zip | |
nixos: set device tree and blacklist turris omnia leds
| -rw-r--r-- | nixos/modules/turris-mox-support.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/turris-omnia-support.nix | 10 |
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; [ |