dnyarri/mmrnmhrm: Switch to generic kernel

I've been patching these machines up since ages and I'm tired now to do
both kernel configs *again* for the recent kernel versions.

Of course, in the long run I still want them to have their customized
kernel, but right now it's better to have a recent generic kernel rather
than have a fucked up custom kernel.

Also, this removes all that cruft for the Intel HDA pinning on dnyarri,
because the machine now has two X-Fi sound cards.

Both machines probably won't boot now, so we'll have to adjust a few
things very soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 0 insertions, 53 deletions

diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index a048672a..491ee233 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -8,8 +8,6 @@ with lib;
   nix.maxJobs = 8;
 
   boot = {
-    kernelParams = [ "snd-hda-intel.patch=patch51.fw" ];
-
     initrd = {
       mdadmConf = ''
         ARRAY /dev/md0 metadata=1.2 UUID=f5e9de04:89efc509:4e184fcc:166b0b67
@@ -30,57 +28,6 @@ with lib;
   };
 
   vuizvui.user.aszlig.system.kernel.enable = true;
-  vuizvui.user.aszlig.system.kernel.config = let
-    radeonFw = [
-      "radeon/R600_rlc.bin"
-      "radeon/R700_rlc.bin"
-      "radeon/RV710_uvd.bin"
-      "radeon/RV710_smc.bin"
-      "radeon/RV730_smc.bin"
-    ];
-
-    extraFw = radeonFw ++ [ "patch51.fw" ];
-
-    patch51 = pkgs.writeText "patch51.fw" ''
-      [codec]
-      0x10ec0889 0x80860033 2
-
-      [pincfg]
-      0x11 0x01442130
-      0x12 0x411111f0
-      0x14 0x01014410
-      0x15 0x0321403f
-      0x16 0x40f000f0
-      0x17 0x40f000f0
-      0x18 0x03a19020
-      0x19 0x40f000f0
-      0x1a 0x01014412
-      0x1b 0x01014411
-      0x1c 0x411111f0
-      0x1d 0x411111f0
-      0x1e 0x01451140
-      0x1f 0x01c51170
-
-      [model]
-      auto
-    '';
-
-  in import ./dnyarri-kconf.nix // {
-    CONFIG_EXTRA_FIRMWARE = concatStringsSep " " extraFw;
-    CONFIG_EXTRA_FIRMWARE_DIR = pkgs.stdenv.mkDerivation {
-      name = "builtin-firmware";
-      buildCommand = let
-        firmwareBasePath = "${pkgs.firmwareLinuxNonfree}/lib/firmware";
-      in ''
-        mkdir -p "$out/radeon"
-        ${concatMapStrings (x: ''
-          cp -Lv -t "$out/radeon" "${firmwareBasePath}/${x}"
-        '') radeonFw}
-
-        cp "${patch51}" "$out/patch51.fw"
-      '';
-    };
-  };
 
   networking.hostName = "dnyarri";