From 0cd1bd99e10ddb25e88a117f2c272e0aedec4c43 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Thu, 2 Mar 2023 23:28:39 +0000 Subject: [PATCH] declare device.flash options in base.nix because they're specified in devices/*/default.nix --- modules/base.nix | 4 ++++ modules/flashable.nix | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/base.nix b/modules/base.nix index b9964e93..435f38e6 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -68,6 +68,10 @@ in { defaultOutput = mkOption { type = types.nonEmptyStr; }; + flash = { + address = mkOption { type = types.str; }; + size = mkOption { type = types.str; }; + }; loadAddress = mkOption { default = null; }; entryPoint = mkOption { }; radios = mkOption { diff --git a/modules/flashable.nix b/modules/flashable.nix index 8def6fcb..b444302e 100644 --- a/modules/flashable.nix +++ b/modules/flashable.nix @@ -9,10 +9,6 @@ let inherit (config.boot) tftp; in { options = { - device.flash = { - address = mkOption { type = types.str; }; - size = mkOption { type = types.str; }; - }; }; config = { kernel = {