nixos/hardware.deviceTree: new module
Add support for custom device-tree files, and applying overlays to them. This is useful for supporting non-discoverable hardware, such as sensors attached to GPIO pins on a Raspberry Pi.
This commit is contained in:
parent
0a477846af
commit
dd0a951279
56
nixos/modules/hardware/device-tree.nix
Normal file
56
nixos/modules/hardware/device-tree.nix
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.hardware.deviceTree;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
hardware.deviceTree = {
|
||||||
|
enable = mkOption {
|
||||||
|
default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false;
|
||||||
|
type = types.bool;
|
||||||
|
description = ''
|
||||||
|
Build device tree files. These are used to describe the
|
||||||
|
non-discoverable hardware of a system.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
base = mkOption {
|
||||||
|
default = "${config.boot.kernelPackages.kernel}/dtbs";
|
||||||
|
defaultText = "\${config.boot.kernelPackages.kernel}/dtbs";
|
||||||
|
example = literalExample "pkgs.deviceTree.raspberryPiDtbs";
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
description = ''
|
||||||
|
The package containing the base device-tree (.dtb) to boot. Contains
|
||||||
|
device trees bundled with the Linux kernel by default.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
overlays = mkOption {
|
||||||
|
default = [];
|
||||||
|
example = literalExample
|
||||||
|
"[\"\${pkgs.deviceTree.raspberryPiOverlays}/w1-gpio.dtbo\"]";
|
||||||
|
type = types.listOf types.path;
|
||||||
|
description = ''
|
||||||
|
A path containing device tree overlays (.dtbo) to be applied to all
|
||||||
|
base device-trees.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
package = mkOption {
|
||||||
|
default = null;
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
description = ''
|
||||||
|
A path containing device tree overlays (.dtbo) to be applied to all
|
||||||
|
base device-trees. Overrides `base` and `overlays`.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf (cfg.enable) {
|
||||||
|
hardware.deviceTree.package = if (cfg.overlays != [])
|
||||||
|
then pkgs.deviceTree.applyOverlays cfg.base cfg.overlays else cfg.base;
|
||||||
|
};
|
||||||
|
}
|
|
@ -46,6 +46,7 @@
|
||||||
./hardware/cpu/amd-microcode.nix
|
./hardware/cpu/amd-microcode.nix
|
||||||
./hardware/cpu/intel-microcode.nix
|
./hardware/cpu/intel-microcode.nix
|
||||||
./hardware/digitalbitbox.nix
|
./hardware/digitalbitbox.nix
|
||||||
|
./hardware/device-tree.nix
|
||||||
./hardware/sensor/iio.nix
|
./hardware/sensor/iio.nix
|
||||||
./hardware/ksm.nix
|
./hardware/ksm.nix
|
||||||
./hardware/ledger.nix
|
./hardware/ledger.nix
|
||||||
|
|
|
@ -46,8 +46,8 @@ let
|
||||||
|
|
||||||
ln -s ${kernelPath} $out/kernel
|
ln -s ${kernelPath} $out/kernel
|
||||||
ln -s ${config.system.modulesTree} $out/kernel-modules
|
ln -s ${config.system.modulesTree} $out/kernel-modules
|
||||||
${optionalString (pkgs.stdenv.hostPlatform.platform.kernelDTB or false) ''
|
${optionalString (config.hardware.deviceTree.package != null) ''
|
||||||
ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs
|
ln -s ${config.hardware.deviceTree.package} $out/dtbs
|
||||||
''}
|
''}
|
||||||
|
|
||||||
echo -n "$kernelParams" > $out/kernel-params
|
echo -n "$kernelParams" > $out/kernel-params
|
||||||
|
|
|
@ -75,9 +75,8 @@ addEntry() {
|
||||||
|
|
||||||
copyToKernelsDir "$path/kernel"; kernel=$result
|
copyToKernelsDir "$path/kernel"; kernel=$result
|
||||||
copyToKernelsDir "$path/initrd"; initrd=$result
|
copyToKernelsDir "$path/initrd"; initrd=$result
|
||||||
# XXX UGLY: maybe the system config should have a top-level "dtbs" entry?
|
dtbDir=$(readlink -m "$path/dtbs")
|
||||||
dtbDir=$(readlink -m "$path/kernel/../dtbs")
|
if [ -e "$dtbDir" ]; then
|
||||||
if [ -d "$dtbDir" ]; then
|
|
||||||
copyToKernelsDir "$dtbDir"; dtbs=$result
|
copyToKernelsDir "$dtbDir"; dtbs=$result
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
28
pkgs/os-specific/linux/device-tree.nix
Normal file
28
pkgs/os-specific/linux/device-tree.nix
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
{ stdenvNoCC, dtc, findutils, raspberrypifw }:
|
||||||
|
|
||||||
|
with stdenvNoCC.lib; {
|
||||||
|
applyOverlays = (base: overlays: stdenvNoCC.mkDerivation {
|
||||||
|
name = "device-tree-overlays";
|
||||||
|
nativeBuildInputs = [ dtc findutils ];
|
||||||
|
buildCommand = let
|
||||||
|
quotedDtbos = concatMapStringsSep " " (o: "\"${toString o}\"") (toList overlays);
|
||||||
|
in ''
|
||||||
|
for dtb in $(find ${base} -name "*.dtb" ); do
|
||||||
|
outDtb=$out/$(realpath --relative-to "${base}" "$dtb")
|
||||||
|
mkdir -p "$(dirname "$outDtb")"
|
||||||
|
fdtoverlay -o "$outDtb" -i "$dtb" ${quotedDtbos};
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
|
||||||
|
raspberryPiDtbs = stdenvNoCC.mkDerivation {
|
||||||
|
name = "raspberrypi-dtbs-${raspberrypifw.version}";
|
||||||
|
nativeBuildInputs = [ raspberrypifw ];
|
||||||
|
buildCommand = ''
|
||||||
|
mkdir -p $out/broadcom/
|
||||||
|
cp ${raspberrypifw}/share/raspberrypi/boot/bcm*.dtb $out/broadcom
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
raspberryPiOverlays = "${raspberrypifw}/share/raspberrypi/boot/overlays";
|
||||||
|
}
|
|
@ -169,6 +169,8 @@ in
|
||||||
|
|
||||||
demoit = callPackage ../servers/demoit { };
|
demoit = callPackage ../servers/demoit { };
|
||||||
|
|
||||||
|
deviceTree = callPackage ../os-specific/linux/device-tree.nix {};
|
||||||
|
|
||||||
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
|
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
|
||||||
|
|
||||||
dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
|
dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
|
||||||
|
|
Loading…
Reference in a new issue