dan/liminix
1
0
Fork 5
Code

declare options.hardware.ubi unconditionally

Browse Source 
this is so it can be defined in device modules even when
ubifs is not included in the configuration
This commit is contained in:
Daniel Barlow 2024-12-23 22:20:16 +00:00
parent 6cd5b90678
commit ede8f12d2b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/hardware.nix
View File

@ -13,6 +13,12 @@ in
options = { options = {
boot = { }; boot = { };
hardware = { 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 = { dts = {
src = mkOption { src = mkOption {
type = types.nullOr types.path; type = types.nullOr types.path;

7
modules/outputs/ubifs.nix
View File

@ -13,13 +13,6 @@ in
./initramfs.nix ./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") { config = mkIf (config.rootfsType == "ubifs") {
kernel.config = { kernel.config = {
MTD_UBI="y"; MTD_UBI="y";