From 5febaab6bd0e119a3f6223aa219e614c02593d06 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 12 May 2023 19:47:31 +0200 Subject: [PATCH] raspberry-pi."4": fix build error with poe-hat, because of incompatibility with compute module Signed-off-by: Florian Brandes --- raspberry-pi/4/default.nix | 2 +- raspberry-pi/4/poe-hat.nix | 2 ++ raspberry-pi/4/poe-plus-hat.nix | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/raspberry-pi/4/default.nix b/raspberry-pi/4/default.nix index acbfcf0..7c442ff 100644 --- a/raspberry-pi/4/default.nix +++ b/raspberry-pi/4/default.nix @@ -32,7 +32,7 @@ }; }; - hardware.deviceTree.filter = "bcm2711-rpi-*.dtb"; + hardware.deviceTree.filter = lib.mkDefault "bcm2711-rpi-*.dtb"; assertions = [ diff --git a/raspberry-pi/4/poe-hat.nix b/raspberry-pi/4/poe-hat.nix index b31dc42..5d6cf8d 100644 --- a/raspberry-pi/4/poe-hat.nix +++ b/raspberry-pi/4/poe-hat.nix @@ -13,6 +13,8 @@ in { config = lib.mkIf cfg.enable { hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = lib.mkDefault true; + # doesn't work for the CM module, so we exclude e.g. bcm2711-rpi-cm4.dts + hardware.deviceTree.filter = "bcm2711-rpi-4*.dtb"; hardware.deviceTree = { overlays = [ diff --git a/raspberry-pi/4/poe-plus-hat.nix b/raspberry-pi/4/poe-plus-hat.nix index e6f806f..bd7c28e 100644 --- a/raspberry-pi/4/poe-plus-hat.nix +++ b/raspberry-pi/4/poe-plus-hat.nix @@ -13,6 +13,8 @@ in { config = lib.mkIf cfg.enable { hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = lib.mkDefault true; + # doesn't work for the CM module, so we exclude e.g. bcm2711-rpi-cm4.dts + hardware.deviceTree.filter = "bcm2711-rpi-4*.dtb"; hardware.deviceTree = { overlays = [