liminix

commit 76f03ecf0f99f78b529342387853f3c6708255b5
parent f57997c60574d29ae8c20074f5d59052f5607fd3
Author: Daniel Barlow <dan@telent.net>
Date:   Sat, 30 Sep 2023 21:52:13 +0100

move OF and USE_OF to arch modules

Diffstat:
M
devices/gl-ar750/default.nix
 | 
2
--
M
devices/gl-mt300a/default.nix
 | 
2
--
M
devices/gl-mt300n-v2/default.nix
 | 
2
--
M
modules/arch/aarch64.nix
 | 
3
+++
M
modules/arch/mips.nix
 | 
3
+++

5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix
@@ -156,8 +156,6 @@
           ${openwrt.applyPatches.ath79}
         '';
         config = {
-          OF = "y";
-          USE_OF = "y";
           ATH79 = "y";
           PCI = "y";
           PCI_AR724X = "y";
diff --git a/devices/gl-mt300a/default.nix b/devices/gl-mt300a/default.nix
@@ -145,8 +145,6 @@
           ${openwrt.applyPatches.ramips}
         '';
         config = {
-          OF = "y";
-          USE_OF = "y";
 
           RALINK = "y";
           PCI = "y";
diff --git a/devices/gl-mt300n-v2/default.nix b/devices/gl-mt300n-v2/default.nix
@@ -117,8 +117,6 @@
           ${openwrt.applyPatches.ramips}
         '';
         config = {
-          OF = "y";
-          USE_OF = "y";
 
           RALINK = "y";
           PCI = "y";
diff --git a/modules/arch/aarch64.nix b/modules/arch/aarch64.nix
@@ -8,6 +8,9 @@
       # on CMDLINE being set to something non-empty
       CMDLINE="\"console=ttyAMA0\"";
       CMDLINE_FROM_BOOTLOADER = "y";
+
+      OF = "y";
+      USE_OF = "y";
     };
     boot.commandLine = [
       "console=ttyAMA0,38400"
diff --git a/modules/arch/mips.nix b/modules/arch/mips.nix
@@ -6,6 +6,9 @@
       MIPS_BOOTLOADER_CMDLINE_REQUIRE_COOKIE = "y";
       MIPS_BOOTLOADER_CMDLINE_COOKIE = "\"liminix\"";
       MIPS_CMDLINE_DTB_EXTEND = "y";
+
+      OF = "y";
+      USE_OF = "y";
     };
     boot.commandLine = [
       "console=ttyS0,115200" # true of all mips we've yet encountered