DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

move dts config option from boot to device

Browse source
This commit is contained in:
Daniel Barlow 2023-03-03 22:43:44 +00:00
parent fd500041fa
commit 263882cbe4
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@
boot.tftp = { boot.tftp = {
loadAddress = "0x00A00000"; loadAddress = "0x00A00000";
}; };
boot.dts = { device.dts = {
src = "${openwrt}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts"; src = "${openwrt}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts";
includes = [ includes = [
"${openwrt}/target/linux/ath79/dts" "${openwrt}/target/linux/ath79/dts"

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

@ -30,7 +30,7 @@
boot.tftp = { boot.tftp = {
loadAddress = "0x00A00000"; loadAddress = "0x00A00000";
}; };
boot.dts = { device.dts = {
src = "${openwrt}/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts"; src = "${openwrt}/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts";
includes = [ includes = [
"${openwrt}/target/linux/ramips/dts" "${openwrt}/target/linux/ramips/dts"

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

@ -30,7 +30,7 @@
boot.tftp = { boot.tftp = {
loadAddress = "0x00A00000"; loadAddress = "0x00A00000";
}; };
boot.dts = { device.dts = {
src = "${openwrt}/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts"; src = "${openwrt}/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts";
includes = [ includes = [
"${openwrt}/target/linux/ramips/dts" "${openwrt}/target/linux/ramips/dts"

4
modules/hardware.nix
View file

@ -4,6 +4,8 @@ let
in { in {
options = { options = {
boot = { boot = {
};
device = {
dts = { dts = {
src = mkOption { type = types.path; }; src = mkOption { type = types.path; };
includes = mkOption { includes = mkOption {
@ -11,8 +13,6 @@ in {
type = types.listOf types.path; type = types.listOf types.path;
}; };
}; };
};
device = {
defaultOutput = mkOption { defaultOutput = mkOption {
type = types.nonEmptyStr; type = types.nonEmptyStr;
}; };

4
modules/outputs.nix
View file

@ -24,8 +24,8 @@ in
}; };
dtb = (callPackage ../kernel/dtb.nix {}) { dtb = (callPackage ../kernel/dtb.nix {}) {
inherit (config.boot) commandLine; inherit (config.boot) commandLine;
dts = config.boot.dts.src; dts = config.device.dts.src;
includes = config.boot.dts.includes ++ [ includes = config.device.dts.includes ++ [
"${kernel.headers}/include" "${kernel.headers}/include"
]; ];
}; };