HackENS/liminix-fork
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move tftp config to base module

Browse source 
we need it for flashing from u-boot even when tftp booting
is not enabled
This commit is contained in:
Daniel Barlow 2023-03-18 14:45:51 +00:00
parent ce05f4e44c
commit e78d5212e6
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/base.nix
View file

@ -42,6 +42,14 @@ in {
type = types.listOf types.nonEmptyStr; type = types.listOf types.nonEmptyStr;
default = []; default = [];
}; };
tftp = {
loadAddress = mkOption { type = types.str; };
# These names match the uboot environment variables. I reserve
# the right to change them if I think of better ones.
ipaddr = mkOption { type = types.str; };
serverip = mkOption { type = types.str; };
enable = mkOption { type = types.boolean; };
};
}; };
}; };
config = { config = {

12
modules/tftpboot.nix
View file

@ -8,18 +8,6 @@ let
inherit (lib) mkOption types concatStringsSep; inherit (lib) mkOption types concatStringsSep;
cfg = config.boot.tftp; cfg = config.boot.tftp;
in { in {
options = {
boot = {
tftp = {
loadAddress = mkOption { type = types.str; };
# These names match the uboot environment variables. I reserve
# the right to change them if I think of better ones.
ipaddr = mkOption { type = types.str; };
serverip = mkOption { type = types.str; };
enable = mkOption { type = types.boolean; };
};
};
};
imports = [ ./ramdisk.nix ]; imports = [ ./ramdisk.nix ];
config = { config = {
boot.ramdisk.enable = true; boot.ramdisk.enable = true;