move regulatory.db to wlan module

This commit is contained in:
Daniel Barlow 2023-03-07 21:32:21 +00:00
parent b65a405a43
commit e8d5e4c788
3 changed files with 18 additions and 5 deletions

View file

@ -58,7 +58,6 @@
phases = ["installPhase"];
installPhase = ''
mkdir -p $out/ath10k/QCA9887/hw1.0/
cp ${pkgs.wireless-regdb}/lib/firmware/regulatory.db* $out/
blobdir=${firmwareBlobs}/QCA9887/hw1.0
cp $blobdir/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00047 $out/ath10k/QCA9887/hw1.0/firmware-5.bin
cp $blobdir/board.bin $out/ath10k/QCA9887/hw1.0/
@ -120,7 +119,6 @@
filesystem = dir {
lib = dir {
firmware = dir {
"regulatory.db" = symlink "${firmware}/regulatory.db";
ath10k = dir {
QCA9887 = symlink "${firmware}/ath10k/QCA9887";
"cal-pci-0000:00:00.0.bin" = symlink "${ath10k_cal_data}/.outputs/data";

View file

@ -13,8 +13,8 @@
description = ''
WiFi on this device is provided by the rt2800soc module. It
expects firmware to be present in the "???" MTD partition, so -
assuming we want to use the wireless - we need to build MTD
expects firmware to be present in the "factory" MTD partition, so
- assuming we want to use the wireless - we need to build MTD
support into the kernel even if we're using TFTP root
'';

View file

@ -2,9 +2,24 @@
let
inherit (lib) mkEnableOption mkOption types isDerivation hasAttr ;
inherit (pkgs.pseudofile) dir symlink;
inherit (pkgs) busybox;
inherit (pkgs) stdenv busybox wireless-regdb;
regulatory = stdenv.mkDerivation {
name = "regulatory.db";
phases = ["installPhase"];
installPhase = ''
mkdir -p $out
cp ${wireless-regdb}/lib/firmware/regulatory.db $out/
'';
};
in {
config = {
filesystem = dir {
lib = dir {
firmware = dir {
"regulatory.db" = symlink "${regulatory}/regulatory.db";
};
};
};
kernel = rec {
config = {
# Most of this is necessary infra to allow wireless stack/