From eaf90df56ca9899a2b989e19c5d008d15447dd4f Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Mon, 6 Feb 2023 23:19:35 +0000 Subject: [PATCH] per-device dts --- default.nix | 4 ++-- devices/gl-ar750/default.nix | 1 + modules/base.nix | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 92d51f0..28ea478 100644 --- a/default.nix +++ b/default.nix @@ -37,7 +37,7 @@ let inherit (config.kernel) config; }; dtb = (callPackage ./kernel/dtb.nix {}) { - dts = "${openwrt}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts"; + dts = config.kernel.dts { inherit openwrt; }; includes = [ "${openwrt}/target/linux/ath79/dts" "${kernel.headers}/include" @@ -95,5 +95,5 @@ in { # this is just here as a convenience, so that we can get a # cross-compiling nix-shell for any package we're customizing - inherit pkgs; + inherit pkgs; } diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix index b0d391e..e82d7a7 100644 --- a/devices/gl-ar750/default.nix +++ b/devices/gl-ar750/default.nix @@ -62,6 +62,7 @@ }; }; kernel = rec { + dts = { openwrt,... }:"${openwrt}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts"; config = { MIPS_ELF_APPENDED_DTB = "y"; OF = "y"; diff --git a/modules/base.nix b/modules/base.nix index e45dddf..efad7b6 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -24,6 +24,7 @@ in { }; filesystem = mkOption { type = types.anything; }; kernel = { + dts = mkOption { type = types.functionTo types.string; }; config = mkOption { # mostly the values are y n or m, but sometimes # other strings are also used