From f1c04c797978f9e404cd7a6c3d454f8028f1ba7f Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Wed, 20 Sep 2023 17:50:21 +0100 Subject: [PATCH] extract mips kernel options to module --- modules/arch/mips.nix | 3 +++ modules/kernel.nix | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/arch/mips.nix b/modules/arch/mips.nix index 2c2780f..784d9b0 100644 --- a/modules/arch/mips.nix +++ b/modules/arch/mips.nix @@ -3,6 +3,9 @@ config = { kernel.config = { MIPS_ELF_APPENDED_DTB = "y"; + MIPS_BOOTLOADER_CMDLINE_REQUIRE_COOKIE = "y"; + MIPS_BOOTLOADER_CMDLINE_COOKIE = "\"liminix\""; + MIPS_CMDLINE_DTB_EXTEND = "y"; }; boot.commandLine = [ "console=ttyS0,115200" # true of all mips we've yet encountered diff --git a/modules/kernel.nix b/modules/kernel.nix index d9e5178..d73665e 100644 --- a/modules/kernel.nix +++ b/modules/kernel.nix @@ -56,10 +56,6 @@ in { MODULE_SIG = if modular then "y" else "n"; DEBUG_FS = "y"; - MIPS_BOOTLOADER_CMDLINE_REQUIRE_COOKIE = "y"; - MIPS_BOOTLOADER_CMDLINE_COOKIE = "\"liminix\""; - MIPS_CMDLINE_DTB_EXTEND = "y"; - # basic networking protocols NET = "y"; UNIX = "y";