commit 44caefcd3bab54c69012d872c681ae782ef3c043
parent 6e6b8790ebc164d1a543bf6fad92af05e000aad0
Author: Daniel Barlow <dan@telent.net>
Date: Tue, 17 Dec 2024 17:34:04 +0000
rename config.hardware.dts.includes -> includePaths
(1) it's a better name
(2) I want to use `includes` to specify dtsi files
Diffstat:
11 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/NEWS b/NEWS
@@ -132,4 +132,8 @@ and then run the generated `install.sh` script
result/install.sh root@192.168.8.1
+2024-12-16
+config option rename: config.hardware.dts.includes is now
+hardware.dts.includePaths, which is a better name and also
+means I can use hardware.dts.includes for a different purpose
+\ No newline at end of file
diff --git a/devices/belkin-rt3200/default.nix b/devices/belkin-rt3200/default.nix
@@ -197,7 +197,7 @@
rootDevice = "ubi0:liminix";
dts = {
src = "${openwrt.src}/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts";
- includes = [
+ includePaths = [
"${openwrt.src}/target/linux/mediatek/dts"
"${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
];
diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix
@@ -116,7 +116,7 @@
rootDevice = "/dev/mtdblock5";
dts = {
src = "${openwrt.src}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts";
- includes = [
+ includePaths = [
"${openwrt.src}/target/linux/ath79/dts"
];
};
diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix
@@ -81,7 +81,7 @@
dts = {
src = "${openwrt.src}/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts";
- includes = [
+ includePaths = [
"${openwrt.src}/target/linux/ramips/dts"
];
};
diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix
@@ -78,7 +78,7 @@
dts = {
src = "${openwrt.src}/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts";
- includes = [
+ includePaths = [
"${openwrt.src}/target/linux/ramips/dts"
];
};
diff --git a/devices/qemu/default.nix b/devices/qemu/default.nix
@@ -66,7 +66,7 @@
# *correct* but it does at least boot
dts = lib.mkForce {
src = "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/mti/malta.dts";
- includes = [
+ includePaths = [
"${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/"
];
};
diff --git a/devices/tp-archer-ax23/default.nix b/devices/tp-archer-ax23/default.nix
@@ -410,7 +410,7 @@
rootDevice = "/dev/mtdblock3";
dts = {
src = "${openwrt.src}/target/linux/ramips/dts/mt7621_tplink_archer-ax23-v1.dts";
- includes = [
+ includePaths = [
"${openwrt.src}/target/linux/ramips/dts"
"${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
];
diff --git a/devices/turris-omnia/default.nix b/devices/turris-omnia/default.nix
@@ -348,7 +348,7 @@
dts = {
src = "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts";
- includes = [
+ includePaths = [
"${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/marvell/"
];
};
diff --git a/devices/zyxel-nwa50ax/default.nix b/devices/zyxel-nwa50ax/default.nix
@@ -124,7 +124,7 @@
hash = "sha256-ifriAjWzFACrxVWCANZpUaEZgB/0pdbhnTVQytx6ddg=";
};
in {
- imports = [
+ imports = [
# We include it to ensure the bridge functionality
# is available on the target kernel.
../../modules/bridge
@@ -184,7 +184,7 @@
# Actually, this is not what we want.
# This DTS is insufficient.
src = ./mt7621_zyxel_nwa50ax.dtsi;
- includes = [
+ includePaths = [
# Here's one weird trick to make `ubi` detection
# out of the box.
# We will write ubi on /dev/firmware_a:rootfs location
@@ -233,7 +233,7 @@
services.zyxel-dual-image = config.boot.zyxel-dual-image.build {
ensureActiveImage = "primary";
# TODO: use mtd names rather…
- # primary and secondary are always /dev/mtd3 by virtue of the
+ # primary and secondary are always /dev/mtd3 by virtue of the
# dtb being not too wrong…
# TODO: remove this hack.
primaryMtdPartition = "/dev/mtd3";
diff --git a/modules/hardware.nix b/modules/hardware.nix
@@ -24,7 +24,7 @@ in
only for QEMU.
'';
};
- includes = mkOption {
+ includePaths = mkOption {
default = [ ];
description = "List of directories to search for DTS includes (.dtsi files)";
type = types.listOf types.path;
diff --git a/modules/outputs.nix b/modules/outputs.nix
@@ -105,7 +105,7 @@ in
dtb = liminix.builders.dtb {
inherit (config.boot) commandLine;
dts = config.hardware.dts.src;
- includes = config.hardware.dts.includes ++ [
+ includes = config.hardware.dts.includePaths ++ [
"${o.kernel.headers}/include"
];
};
