liminix

commit 263882cbe4afdef3c08728e46d30ad51a5ccb8ee
parent fd500041fa5d6824e54472368eed3bca37bf6562
Author: Daniel Barlow <dan@telent.net>
Date:   Fri,  3 Mar 2023 22:43:44 +0000

move dts config option from boot to device

Diffstat:
M
devices/gl-ar750/default.nix
 | 
2
+-
M
devices/gl-mt300a/default.nix
 | 
2
+-
M
devices/gl-mt300n-v2/default.nix
 | 
2
+-
M
modules/hardware.nix
 | 
4
++--
M
modules/outputs.nix
 | 
4
++--

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix
@@ -125,7 +125,7 @@
       boot.tftp = {
         loadAddress = "0x00A00000";
       };
-      boot.dts = {
+      device.dts = {
         src = "${openwrt}/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts";
         includes =  [
           "${openwrt}/target/linux/ath79/dts"
diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix
@@ -30,7 +30,7 @@
       boot.tftp = {
         loadAddress = "0x00A00000";
       };
-      boot.dts = {
+      device.dts = {
         src = "${openwrt}/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts";
         includes = [
           "${openwrt}/target/linux/ramips/dts"
diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix
@@ -30,7 +30,7 @@
       boot.tftp = {
         loadAddress = "0x00A00000";
       };
-      boot.dts = {
+      device.dts = {
         src = "${openwrt}/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts";
         includes = [
           "${openwrt}/target/linux/ramips/dts"
diff --git a/modules/hardware.nix b/modules/hardware.nix
@@ -4,6 +4,8 @@ let
 in {
   options = {
     boot = {
+    };
+    device = {
       dts = {
         src = mkOption { type = types.path; };
         includes = mkOption {
@@ -11,8 +13,6 @@ in {
           type = types.listOf types.path;
         };
       };
-    };
-    device = {
       defaultOutput = mkOption {
         type = types.nonEmptyStr;
       };
diff --git a/modules/outputs.nix b/modules/outputs.nix
@@ -24,8 +24,8 @@ in
       };
       dtb =  (callPackage ../kernel/dtb.nix {}) {
         inherit (config.boot) commandLine;
-        dts = config.boot.dts.src;
-        includes = config.boot.dts.includes ++ [
+        dts = config.device.dts.src;
+        includes = config.device.dts.includes ++ [
           "${kernel.headers}/include"
         ];
       };