raboof/liminix
1
0
Fork 0
forked from dan/liminix
Code Pull Requests Activity

rename config.hardware.dts.includes -> includePaths

Browse Source 
(1) it's a better name
(2) I want to use `includes` to specify dtsi files
This commit is contained in:
Daniel Barlow 2024-12-17 17:34:04 +00:00
parent 6e6b8790eb
commit 44caefcd3b
11 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -132,4 +132,8 @@ and then run the generated `install.sh` script
result/install.sh root@192.168.8.1 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

2
devices/belkin-rt3200/default.nix
View File

@ -197,7 +197,7 @@
rootDevice = "ubi0:liminix"; rootDevice = "ubi0:liminix";
dts = { dts = {
src = "${openwrt.src}/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts"; src = "${openwrt.src}/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts";
includes = [ includePaths = [
"${openwrt.src}/target/linux/mediatek/dts" "${openwrt.src}/target/linux/mediatek/dts"
"${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/" "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
]; ];

2
devices/gl-ar750/default.nix
View File

@ -116,7 +116,7 @@
rootDevice = "/dev/mtdblock5"; rootDevice = "/dev/mtdblock5";
dts = { dts = {
src = "${openwrt.src}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts"; src = "${openwrt.src}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts";
includes = [ includePaths = [
"${openwrt.src}/target/linux/ath79/dts" "${openwrt.src}/target/linux/ath79/dts"
]; ];
}; };

2
devices/gl-mt300a/default.nix
View File

@ -81,7 +81,7 @@
dts = { dts = {
src = "${openwrt.src}/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts"; src = "${openwrt.src}/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts";
includes = [ includePaths = [
"${openwrt.src}/target/linux/ramips/dts" "${openwrt.src}/target/linux/ramips/dts"
]; ];
}; };

2
devices/gl-mt300n-v2/default.nix
View File

@ -78,7 +78,7 @@
dts = { dts = {
src = "${openwrt.src}/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts"; src = "${openwrt.src}/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts";
includes = [ includePaths = [
"${openwrt.src}/target/linux/ramips/dts" "${openwrt.src}/target/linux/ramips/dts"
]; ];
}; };

2
devices/qemu/default.nix
View File

@ -66,7 +66,7 @@
# *correct* but it does at least boot # *correct* but it does at least boot
dts = lib.mkForce { dts = lib.mkForce {
src = "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/mti/malta.dts"; src = "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/mti/malta.dts";
includes = [ includePaths = [
"${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/" "${config.system.outputs.kernel.modulesupport}/arch/mips/boot/dts/"
]; ];
}; };

2
devices/tp-archer-ax23/default.nix
View File

@ -410,7 +410,7 @@
rootDevice = "/dev/mtdblock3"; rootDevice = "/dev/mtdblock3";
dts = { dts = {
src = "${openwrt.src}/target/linux/ramips/dts/mt7621_tplink_archer-ax23-v1.dts"; src = "${openwrt.src}/target/linux/ramips/dts/mt7621_tplink_archer-ax23-v1.dts";
includes = [ includePaths = [
"${openwrt.src}/target/linux/ramips/dts" "${openwrt.src}/target/linux/ramips/dts"
"${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/" "${config.system.outputs.kernel.modulesupport}/arch/arm64/boot/dts/mediatek/"
]; ];

2
devices/turris-omnia/default.nix
View File

@ -348,7 +348,7 @@
dts = { dts = {
src = "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/marvell/armada-385-turris-omnia.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/" "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/marvell/"
]; ];
}; };

2
devices/zyxel-nwa50ax/default.nix
View File

@ -184,7 +184,7 @@
# Actually, this is not what we want. # Actually, this is not what we want.
# This DTS is insufficient. # This DTS is insufficient.
src = ./mt7621_zyxel_nwa50ax.dtsi; src = ./mt7621_zyxel_nwa50ax.dtsi;
includes = [ includePaths = [
# Here's one weird trick to make `ubi` detection # Here's one weird trick to make `ubi` detection
# out of the box. # out of the box.
# We will write ubi on /dev/firmware_a:rootfs location # We will write ubi on /dev/firmware_a:rootfs location

2
modules/hardware.nix
View File

@ -24,7 +24,7 @@ in
only for QEMU. only for QEMU.
''; '';
}; };
includes = mkOption { includePaths = mkOption {
default = [ ]; default = [ ];
description = "List of directories to search for DTS includes (.dtsi files)"; description = "List of directories to search for DTS includes (.dtsi files)";
type = types.listOf types.path; type = types.listOf types.path;

2
modules/outputs.nix
View File

@ -105,7 +105,7 @@ in
dtb = liminix.builders.dtb { dtb = liminix.builders.dtb {
inherit (config.boot) commandLine; inherit (config.boot) commandLine;
dts = config.hardware.dts.src; dts = config.hardware.dts.src;
includes = config.hardware.dts.includes ++ [ includes = config.hardware.dts.includePaths ++ [
"${o.kernel.headers}/include" "${o.kernel.headers}/include"
]; ];
}; };