liminix

commit ede8f12d2bfa1af2f24048e4a0fd8f36dfbe7f80
parent 6cd5b906780fb69871f49f2a985adc58c169417f
Author: Daniel Barlow <dan@telent.net>
Date:   Mon, 23 Dec 2024 22:20:16 +0000

declare options.hardware.ubi unconditionally

this is so it can be defined in device modules even when
ubifs is not included in the configuration

Diffstat:
M
modules/hardware.nix
 | 
6
++++++
M
modules/outputs/ubifs.nix
 | 
7
-------

2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/modules/hardware.nix b/modules/hardware.nix
@@ -13,6 +13,12 @@ in
   options = {
     boot = { };
     hardware = {
+      ubi = {
+        minIOSize = mkOption { type = types.str; };
+        logicalEraseBlockSize = mkOption { type = types.str; }; # LEB
+        physicalEraseBlockSize = mkOption { type = types.str; }; # PEB
+        maxLEBcount = mkOption { type = types.str; }; # LEB
+      };
       dts = {
         src = mkOption {
           type = types.nullOr types.path;
diff --git a/modules/outputs/ubifs.nix b/modules/outputs/ubifs.nix
@@ -13,13 +13,6 @@ in
     ./initramfs.nix
   ];
 
-  options.hardware.ubi = {
-    minIOSize = mkOption { type = types.str; };
-    logicalEraseBlockSize = mkOption { type = types.str; }; # LEB
-    physicalEraseBlockSize = mkOption { type = types.str; }; # PEB
-    maxLEBcount = mkOption { type = types.str; }; # LEB
-  };
-
   config = mkIf (config.rootfsType == "ubifs") {
     kernel.config = {
       MTD_UBI="y";