From 1ca3079f7a87f1985673d88b2d2bc994e3888393 Mon Sep 17 00:00:00 2001
From: drebrez <drebrez@gmail.com>
Date: Mon, 6 Nov 2017 23:03:35 +0100
Subject: [PATCH] [samsung-maguro] Add firmware-samsung-maguro package (#849)

---
 aports/device/device-samsung-maguro/APKBUILD  |   8 +-
 .../device/device-samsung-maguro/bcmdhd.cal   | 103 ------------------
 aports/device/linux-samsung-maguro/APKBUILD   |   4 +-
 .../config-samsung-maguro.armhf               |   4 +-
 .../firmware/firmware-samsung-maguro/APKBUILD |  24 ++++
 5 files changed, 30 insertions(+), 113 deletions(-)
 delete mode 100644 aports/device/device-samsung-maguro/bcmdhd.cal
 create mode 100644 aports/firmware/firmware-samsung-maguro/APKBUILD

diff --git a/aports/device/device-samsung-maguro/APKBUILD b/aports/device/device-samsung-maguro/APKBUILD
index 6badd68d..f8bedce8 100644
--- a/aports/device/device-samsung-maguro/APKBUILD
+++ b/aports/device/device-samsung-maguro/APKBUILD
@@ -1,17 +1,16 @@
 pkgname=device-samsung-maguro
 pkgver=2
-pkgrel=12
+pkgrel=13
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-firmware linux-samsung-maguro mkbootimg"
+depends="linux-samsung-maguro mkbootimg firmware-samsung-maguro"
 makedepends=""
 install=""
 subpackages=""
 source="
 	deviceinfo
-	bcmdhd.cal
 	90-android-touch-dev.rules
 "
 options="!check"
@@ -19,12 +18,9 @@ options="!check"
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
 		"$pkgdir"/etc/deviceinfo
-	install -D -m644 "$srcdir"/bcmdhd.cal \
-		"$pkgdir"/etc/wifi/bcmdhd.cal
 	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
 sha512sums="56f67205541eba307c333fbccd8510d9d972699be35bade8762028fc18f0c3c6f904eadc4fced783f042c1eeb57adc684915b8bd90f954cfb6560af662526928  deviceinfo
-27e89ef3102a89e99065ea12cd36d8ebe1c7e95f2f7082c0e7e3e280fcd2473aa197538bae18ac8995ddf3a7dd962622a56a6f0c037ad193fa9bba95bbb7ee9c  bcmdhd.cal
 f8c85b0ffcee751ee30d5f1fd8ed8e8413d9599875839fbc9bcfd85f08dbf203fecbd171fc3fe4e2742c5b8243132f6110142ff41193d6ad7df29b411516e199  90-android-touch-dev.rules"
diff --git a/aports/device/device-samsung-maguro/bcmdhd.cal b/aports/device/device-samsung-maguro/bcmdhd.cal
deleted file mode 100644
index f70fdf7c..00000000
--- a/aports/device/device-samsung-maguro/bcmdhd.cal
+++ /dev/null
@@ -1,103 +0,0 @@
-manfid=0x2d0
-prodid=0x0532
-vendid=0x14e4
-devid=0x4360
-boardtype=0x0532
-boardrev=0x20
-boardflags=0x10080201
-nocrc=1
-xtalfreq=37400
-xtalmode=0x20,0x4,0
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-ag0=252
-ag1=252
-aa2g=1
-aa5g=1
-ccode=EU
-regrev=5
-#for BT-coexistence
-btc_params80=0
-btc_params6=10
-btc_params8=10000
-sd_gpout=0
-# sd_oobonly=1
-muxenab=0x10
-# 2G PA param_B42R 110927
-pa0b0=0x12E4
-pa0b1=0xFE09
-pa0b2=0xFF9A
-#pa0itssit=62
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-# rssi params for 5GHz B42R_110803
-#rssismf5g=0x4
-rssismf5g=0xa
-rssismc5g=0x7
-rssisav5g=0x1
-#PA parameters for lower band
-pa1lob0=0x144F
-pa1lob1=0xFD6B
-pa1lob2=0xFF3B
-#PA parameters for midband
-pa1b0=0x139C
-pa1b1=0xFD87
-pa1b2=0xFF4F
-#PA parameters for high band
-pa1hib0=0x12CA
-pa1hib1=0xFD9A
-pa1hib2=0xFF4E
-# 2G PA offset
-maxp2ga0=64
-sromrev=3
-cckpo=0
-ofdm2gpo=0x66666666
-mcs2gpo0=0xaaaa
-mcs2gpo1=0xaaaa
-# 5G PA offset
-maxp5ga0=66
-maxp5gla0=66
-maxp5gha0=66
-ofdm5gpo=0x22222222
-ofdm5glpo=0x11111111
-ofdm5ghpo=0x22222222
-mcs5gpo0=0x6666
-mcs5gpo1=0x6666
-mcs5glpo0=0x5555
-mcs5glpo1=0x5555
-mcs5ghpo0=0x6666
-mcs5ghpo1=0x6666
-cckPwrOffset=4
-cckdigfilttype=22
-ofdmdigfilttype=2
-extpagain5g=2
-#wl0id=0x431b
-# For 2GHz Tx EVM/SM
-rfreg033=0x19
-rfreg033_cck=0x1d
-pacalidx2g=65
-dacrate2g=160
-txalpfbyp2g=1
-bphyscale=17
-# 5GHz LOFT and IQ CAL
-txgaintbl5g=1
-txiqlopapu5g=1
-txiqlopag5g=0x10
-iqlocalidx5g=24
-# 5GHz Noise CAL parameter
-noise_cal_po_5g=5
-noise_cal_enable_5g=0
-# 2GHz RxPER at low rates
-noise_cal_ref_2g=56
-noise_cal_po_bias_2g=-4
-noise_cal_enable_2g=1
-# Max input level on a-band
-triso5g=9
-# Tx power control, especially temp.
-tssitime=1
-#fc+1.7GHz Spur Elimination
-loidacmode5g=1
-swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff
-swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8
-
diff --git a/aports/device/linux-samsung-maguro/APKBUILD b/aports/device/linux-samsung-maguro/APKBUILD
index 47ec6cab..c5cc1a06 100644
--- a/aports/device/linux-samsung-maguro/APKBUILD
+++ b/aports/device/linux-samsung-maguro/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-maguro"
 pkgver=3.0.31
-pkgrel=8
+pkgrel=9
 pkgdesc="Samsung Galaxy Nexus kernel from LineageOS"
 arch="armhf"
 _carch="arm"
@@ -58,7 +58,7 @@ package() {
 }
 
 sha512sums="f117b3202c3db1a575598fd87ee27080db5c447c986ced677b63e6b00613ebfab58d634bf63b8bcf0c229eb0bec4dc81b13d7cfda3c2aee62e9ed8e26eeb860c  linux-samsung-maguro-e14e5fe679a63eef92346cde874175d8b62b6a4a.tar.gz
-283d747b011e4ea283680f618ee4ab6373d4879f285f22ee733ef542ea6b12d24e27a641b8a04c0448862ca58d2702d8a60db84c14da504d0deb8143994222cd  config-samsung-maguro.armhf
+6ba270b415506ef4e0a34dcd775d9d59cb749d2a1f4b9863444b866567ed7b05594215ae5ae4f8d302be826a64df97e6824ef38184b7566026d0e73801ed528b  config-samsung-maguro.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 d8cdc1137e6a4ad78a3a31acc40f0c98f4db272eaf5b90ee850abb83b80916c4ff3c18a0a181e94eebead44213f6314e3363d0c4b91d95ee1adafbcad6dc57ab  android_paranoid_network.patch
 65eb11dca6645073885228af6aae6efa40b6f063fd04157b501acf40368bf331dd701f746ed187659f654a9354ddf304aaefca8ffc9ea2b00c145c61162e1189  fix_old_perl_code.patch"
diff --git a/aports/device/linux-samsung-maguro/config-samsung-maguro.armhf b/aports/device/linux-samsung-maguro/config-samsung-maguro.armhf
index e2fb0f60..e89b28cd 100644
--- a/aports/device/linux-samsung-maguro/config-samsung-maguro.armhf
+++ b/aports/device/linux-samsung-maguro/config-samsung-maguro.armhf
@@ -1214,8 +1214,8 @@ CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCM4329 is not set
 CONFIG_BCMDHD=y
-CONFIG_BCMDHD_FW_PATH="/lib/firmware/brcm/brcmfmac4330-sdio.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/etc/wifi/bcmdhd.cal"
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd/bcm4330/fw_bcm4330_abg.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/bcmdhd/bcm4330/bcmdhd.cal"
 # CONFIG_DHD_USE_STATIC_BUF is not set
 # CONFIG_DHD_USE_SCHED_SCAN is not set
 CONFIG_DHD_ENABLE_P2P=y
diff --git a/aports/firmware/firmware-samsung-maguro/APKBUILD b/aports/firmware/firmware-samsung-maguro/APKBUILD
new file mode 100644
index 00000000..9936b81d
--- /dev/null
+++ b/aports/firmware/firmware-samsung-maguro/APKBUILD
@@ -0,0 +1,24 @@
+pkgname=firmware-samsung-maguro
+pkgver=1
+pkgrel=0
+pkgdesc="Google Galaxy Nexus (GSM) Firmware"
+url="https://github.com/postmarketOS"
+arch="noarch"
+license="proprietary"
+depends="firmware-aosp-broadcom-wlan"
+options="!check !strip"
+
+# Source
+_bcmdhd_cal_url="https://github.com/LineageOS/android_device_samsung_tuna"
+_bcmdhd_cal_commit="1b5aede175101b44c58d296c833efda46e1b86de"
+
+source="
+	$pkgname-$_bcmdhd_cal_commit-bcmdhd.cal::${_bcmdhd_cal_url}/raw/${_bcmdhd_cal_commit}/bcmdhd.cal
+"
+
+package() {
+	install -Dm644 "$srcdir/$pkgname-$_bcmdhd_cal_commit-bcmdhd.cal" \
+		"$pkgdir/lib/firmware/postmarketos/bcmdhd/bcm4330/bcmdhd.cal"
+}
+
+sha512sums="64ba565246847cd4296713e554a37d5f2238c7d3b3545612de3ae00073364fc2c8c610cdd3291254526555658f464351a9c08ed8cbe1a733a8e0665bbab98094  firmware-samsung-maguro-1b5aede175101b44c58d296c833efda46e1b86de-bcmdhd.cal"