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 3cbd8a0a..db235072 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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

literal 0
HcmV?d00001