From d6b554a85caac840430a822aae963c811e9c7e26 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Fri, 29 Sep 2023 05:23:02 +1000
Subject: [PATCH] pine64-pinebook-pro: remove superfluous ap6256-firmware
 package

I have been running for >1 year with the upstream linux-firmware
package (i.e. just hardware.enableRedistributableFirmware = true)

https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/WHENCE#n2767
---
 pine64/pinebook-pro/default.nix               |  3 --
 .../firmware/ap6256-firmware/default.nix      | 39 -------------------
 2 files changed, 42 deletions(-)
 delete mode 100644 pine64/pinebook-pro/firmware/ap6256-firmware/default.nix

diff --git a/pine64/pinebook-pro/default.nix b/pine64/pinebook-pro/default.nix
index 848a586..37c1c84 100644
--- a/pine64/pinebook-pro/default.nix
+++ b/pine64/pinebook-pro/default.nix
@@ -48,9 +48,6 @@
   ];
 
   hardware.enableRedistributableFirmware = true;
-  hardware.firmware = [
-    (pkgs.callPackage ./firmware/ap6256-firmware { })
-  ];
 
   # The default powersave makes the wireless connection unusable.
   networking.networkmanager.wifi.powersave = lib.mkDefault false;
diff --git a/pine64/pinebook-pro/firmware/ap6256-firmware/default.nix b/pine64/pinebook-pro/firmware/ap6256-firmware/default.nix
deleted file mode 100644
index caddfb2..0000000
--- a/pine64/pinebook-pro/firmware/ap6256-firmware/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, fetchFromGitHub
-, runCommand
-}:
-
-let
-  src = fetchFromGitHub {
-    owner = "nix-community";
-    repo = "rkwifibt";
-    rev = "3524d73251fe4d16f0f873e583aa63b12a90ac26";
-    sha256 = "0ac7z3m5mnmk1qhf9pq9s3y6ky8jmd3ggn8m29797z1ng40q3cka";
-  };
-in
-runCommand "pinebookpro-ap6256-firmware"
-{
-  meta = with lib; {
-    license = licenses.unfreeRedistributable;
-  };
-} ''
-  (PS4=" $ "; set -x
-  cp ${src}/"firmware/broadcom/all/bt/BCM4345C5.hcd"               "BCM4345C5.hcd"
-  cp ${src}/"firmware/broadcom/all/wifi/fw_bcm43456c5_ag.bin"      "fw_bcm43456c5_ag.bin"
-  cp ${src}/"clm_blob/broadcom/AP6256/brcmfmac43456-sdio.clm_blob" "brcmfmac43456-sdio.clm_blob"
-  cp ${src}/"firmware/broadcom/all/wifi/nvram_ap6256.txt"          "nvram_ap6256.txt"
-  mkdir -p $out/lib/firmware/brcm
-  # Bluetooth firmware
-  install -Dm644 "BCM4345C5.hcd" -t "$out/lib/firmware/"
-  install -Dm644 "BCM4345C5.hcd"    "$out/lib/firmware/brcm/BCM.hcd"
-  install -Dm644 "BCM4345C5.hcd" -t "$out/lib/firmware/brcm/"
-  # Wifi firmware
-  install -Dm644 "nvram_ap6256.txt" -t         "$out/lib/firmware/"
-  install -Dm644 "fw_bcm43456c5_ag.bin"        "$out/lib/firmware/brcm/brcmfmac43456-sdio.bin"
-  install -Dm644 "brcmfmac43456-sdio.clm_blob" "$out/lib/firmware/brcm/brcmfmac43456-sdio.clm_blob"
-  install -Dm644 "nvram_ap6256.txt"            "$out/lib/firmware/brcm/brcmfmac43456-sdio.radxa,rockpi4b.txt"
-  install -Dm644 "nvram_ap6256.txt"            "$out/lib/firmware/brcm/brcmfmac43456-sdio.radxa,rockpi4c.txt"
-  install -Dm644 "nvram_ap6256.txt"            "$out/lib/firmware/brcm/brcmfmac43456-sdio.pine64,pinebook-pro.txt"
-  install -Dm644 "nvram_ap6256.txt"            "$out/lib/firmware/brcm/brcmfmac43456-sdio.pine64,rockpro64-v2.1.txt"
-  )
-''