From 080c44106f423c06d2018725dee647a6781a0190 Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Sun, 7 Feb 2021 13:31:26 +1300
Subject: [PATCH] A temporary hack to install the Surface Go firmware

---
 microsoft/surface/firmware/ath10k.nix         |  19 +++++++++---------
 .../firmware/ath10k/K1535_Debian/board.bin    | Bin 0 -> 8124 bytes
 2 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 microsoft/surface/firmware/ath10k/K1535_Debian/board.bin

diff --git a/microsoft/surface/firmware/ath10k.nix b/microsoft/surface/firmware/ath10k.nix
index 3cbd8a0..db23507 100644
--- a/microsoft/surface/firmware/ath10k.nix
+++ b/microsoft/surface/firmware/ath10k.nix
@@ -1,13 +1,15 @@
 {stdenv, pkgs, firmwareLinuxNonfree, ...}:
 let
   repos = (pkgs.callPackage ../repos.nix {});
+  ath10k = ./ath10k;
+  # ath10k = repos.ath10k-firmware;
 in
 
 firmwareLinuxNonfree.overrideAttrs (old: rec {
   pname = "microsoft-surface-go-firmware-linux-nonfree";
   srcs = [
     firmwareLinuxNonfree.src
-    repos.ath10k-firmware
+    ath10k
   ];
 
   sourceRoot = firmwareLinuxNonfree.src;
@@ -15,15 +17,12 @@ firmwareLinuxNonfree.overrideAttrs (old: rec {
 
   dontMakeSourcesWritable = true;
   postInstall = ''
-    # rm -v $out/lib/firmware/ath10k/{hw2.1,hw3.0}/board.bin
-    # rm -v $out/lib/firmware/ath10k/{hw2.1,hw3.0}/board2.bin
+    # Delete the non-working firmware:
+    rm -v $out/lib/firmware/ath10k/QCA6174/{hw2.1,hw3.0}/board.bin
+    rm -v $out/lib/firmware/ath10k/QCA6174/{hw2.1,hw3.0}/board-2.bin
 
-    # cp $srcs[1] $out/lib/firmware/ath10k/hw2.1/
-    # cp $srcs[1] $out/lib/firmware/ath10k/hw3.0/
-
-    #TODO:
-    pwd
-    echo src = $src, srcs = $srcs
-    exit 1
+    # Install the Surface Go Wifi firmware:
+    cp ${ath10k}/K1535_Debian/board.bin $out/lib/firmware/ath10k/QCA6174/hw2.1/
+    cp ${ath10k}/K1535_Debian/board.bin $out/lib/firmware/ath10k/QCA6174/hw3.0/
   '';
 })
diff --git a/microsoft/surface/firmware/ath10k/K1535_Debian/board.bin b/microsoft/surface/firmware/ath10k/K1535_Debian/board.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ed0b7f778ee5544e266a79207e34ead8865ac0e8
GIT binary patch
literal 8124
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
KH##uDI{hagg@Tj-

literal 0
HcmV?d00001