liminix

commit 41ff5a1fe699293931d58023e37802367f4f24ce
parent 626a365f790f628dc8deff27b2296545f239d3fe
Author: Daniel Barlow <dan@telent.net>
Date:   Wed,  1 Mar 2023 18:11:38 +0000

move FW_LOADER* config to modules/base

Diffstat:
M
devices/gl-ar750/default.nix
 | 
4
----
M
devices/gl-mt300a/default.nix
 | 
4
----
M
devices/gl-mt300n-v2/default.nix
 | 
4
----
M
modules/base.nix
 | 
7
+++++++

4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix
@@ -157,10 +157,6 @@
 
           CMDLINE_PARTITION = "y";
           EARLY_PRINTK = "y";
-          FW_LOADER = "y";
-          # we don't have a user helper, so we get multiple 60s pauses
-          # at boot time unless we disable trying to call it
-          FW_LOADER_USER_HELPER = "n";
 
           PARTITION_ADVANCED = "y";
           PRINTK_TIME = "y";
diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix
@@ -99,10 +99,6 @@
 
           CMDLINE_PARTITION = "y";
           EARLY_PRINTK = "y";
-          FW_LOADER = "y";
-          # we don't have a user helper, so we get multiple 60s pauses
-          # at boot time unless we disable trying to call it
-          FW_LOADER_USER_HELPER = "n";
 
           PARTITION_ADVANCED = "y";
           PRINTK_TIME = "y";
diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix
@@ -108,10 +108,6 @@
 
           CMDLINE_PARTITION = "y";
           EARLY_PRINTK = "y";
-          FW_LOADER = "y";
-          # we don't have a user helper, so we get multiple 60s pauses
-          # at boot time unless we disable trying to call it
-          FW_LOADER_USER_HELPER = "n";
 
           PARTITION_ADVANCED = "y";
           PRINTK_TIME = "y";
diff --git a/modules/base.nix b/modules/base.nix
@@ -105,6 +105,13 @@ in {
         TMPFS = "y";
         TMPFS_POSIX_ACL = "y";
         TMPFS_XATTR = "y";
+
+        FW_LOADER = "y";
+        FW_LOADER_COMPRESS = "y";
+        # We don't have a user helper, so we get multiple 60s pauses
+        # at boot time unless we disable trying to call it.
+        # https://lkml.org/lkml/2013/8/5/175
+        FW_LOADER_USER_HELPER = "n";
       };
     };
     boot.commandLine = [