samsung-nevisp: support wifi

device/device-samsung-nevisp/APKBUILD

@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname="device-samsung-nevisp"
 pkgdesc="Samsung Galaxy Fame GT-S6810P"
-pkgver=0.1
+pkgver=0.2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,7 +11,11 @@ arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-samsung-nevisp mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo
+	nvram_net.txt
+	bcmdhd_sta.bin_b2
+	modules-load.conf"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,7 +23,21 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+	install -Dm644 "$srcdir"/modules-load.conf \
+	"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
+}
+
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	mkdir "$subpkgdir"
+	install -D -m644 "$srcdir"/nvram_net.txt \
+		"$subpkgdir"/lib/firmware/postmarketos/bcmdhd.cal
+	install -D -m644 "$srcdir"/bcmdhd_sta.bin_b2 \
+		"$subpkgdir"/lib/firmware/postmarketos/fw_bcmdhd.bin_b2
 }
 
 
-sha512sums="233d1fca39301b3ba995b6ae9a52aa19d7124efd2f452009f828d1fe0ae88fcde98a46257990adf75281d8cf99b3bf1d24c30ff949393e54f4f0e6a55a35734e  deviceinfo"
+sha512sums="233d1fca39301b3ba995b6ae9a52aa19d7124efd2f452009f828d1fe0ae88fcde98a46257990adf75281d8cf99b3bf1d24c30ff949393e54f4f0e6a55a35734e  deviceinfo
+46a5ef749a2bdf7e4a4ec7efceae10f892b69fa2fdf22c778f3580e63b9c191ca30ec24eae3dbd447d05d8081ef2052188f1f7c8ad0c466f61f9b24388ddb130  nvram_net.txt
+5beb067b5d84e7979911100605e0ee6027b8c62249983d3c2720d19e3b9746645613356d0a6fec10757cc4e4db5f0fce1fc8c8809f91dc49cf32edb08d377cca  bcmdhd_sta.bin_b2
+0aa06f2147be0ce89fb1ae418abff809ffa8de677afce4e3b29926ccea66f776065d2bb95675a8692230e40e57ec2ce657d9b3f79be56f1db35f4a724a3484f9  modules-load.conf"

device/device-samsung-nevisp/modules-load.conf

+# This file contains the names of kernel modules that should be loaded
+# at boot time, one per line. Lines beginning with "#" are ignored.
+# wifi module
+
+dhd

device/device-samsung-nevisp/nvram_net.txt

+# NVRAM file for BCM94334WLAGB Single   2013.15.14
+# 2.4GHz FEM RFMD RFFM8204
+
+manfid=0x2d0
+prodid=0x05de
+vendid=0x14e4
+devid=0x4380
+boardtype=0x05de
+boardrev=0x1204
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+sromrev=3
+#boardflags: 
+#            2.4GHz FEM: has 2.4GHz ePA + SP3T
+#            2.4GHz FEM: SP3T switch share with BT
+#            keep original 0x200
+boardflags=0x80a01
+xtalfreq=26000
+nocrc=1
+ag0=0
+aa2g=1
+ccode=GB
+pa0itssit=0x20
+
+#PA parameters for 2.4GHz
+pa0b0=0x1418
+pa0b1=0xFD6C
+pa0b2=0xFF41
+
+maxp2ga0=76
+ofdm2gpo=0x44444444
+mcs2gpo0=0x6666
+mcs2gpo1=0x6666
+
+
+tssifloor2g=19
+extpagain2g=2
+
+# rssi params for 2.4GHz
+#rssismf2g=0xf
+#rssismc2g=0x8
+#rssisav2g=0x1
+# rssi params(RFMD) for 2.4GHz
+rssismf2g=0x3
+rssismc2g=0xa
+rssisav2g=0x1
+
+cckPwrOffset=-8
+cckdigfilttype=24
+ofdmdigfilttype2g=3
+
+il0macaddr=00:90:4c:c5:12:38
+wl0id=0x431b
+pagc2g=0x10
+
+# Parameters for DAC2x mode and ALPF bypass
+dacrate2xen=1
+txalpfbyp=1
+#txalpfpu=1
+
+#Murata 2G FEM switch control table
+swctrlmap_2g=0x00040004,0x00020002,0x00000000,0x10200,0x1ff
+
+elna_off_gain_idx_2g=32
+triso2g=8
+dacpu.fab.4=1
+
+aci_detect_en_2g=1
+txiqlopapu2g=0
+dlorange_lowlimit=-128
+loflag=1
+
+gain_settle_dly_2g=4
+noise_cal_po_2g=-1
+noise_cal_high_gain_2g=73
+noise_cal_nf_substract_val_2g=346
+
+rssicorrnorm=0
+rssicorratten=0
+
+sd_gpout=4
+sd_gpval=1
+sd_oobonly=1
+
+btc_params80=0
+btc_params6=10
+btc_params95=53

device/linux-samsung-nevisp/APKBUILD

@@ -5,7 +5,7 @@
 
 pkgname="linux-samsung-nevisp"
 pkgver=3.0.101
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy Fame GT-S6810P kernel fork"
 arch="armv7"
 _carch="arm"
@@ -45,6 +45,12 @@ build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+
+	# the 'no-pic' flag is necessary to avoid the
+	# error 'Unknown symbol _GLOBAL_OFFSET_TABLE_ (err 0)' when loading the module
+	make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" modules
+
 }
 
 package() {
@@ -65,10 +71,18 @@ package() {
 		error "Could not find zImage in $PWD!"
 		return 1
 	fi
+
+	# Modules
+	cd "$builddir"
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
+		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 \
+		modules_install
 }
 
 sha512sums="1c62313451ff2a04ab9259a4b2c954388a360f45f20af90d05e9cfe73d31f49fc4847f24c1742c89a45f1646e1d27999fc6f5bd224baba7046b07ab324e7baae  linux-samsung-nevisp-8224116dca7de79d181c0761468f569e6ac3505e.tar.gz
-18056bc314704d2a6f9f2c14cddd970663297c49296909ebe4d42ec5b4b55d107a86ef1b6b8df82c46f6ac1cd4b09e8aca1383d54a005bc380fa4134c87b4372  config-samsung-nevisp.armv7
+a6c7bff882eb299c11f8fc8e1d3e70119e78493c5ecec7c8607b44bf5930bfe7bf11033005cd1912264d30fba8fda8b39737f5b37a91778110e3a4ff038e421d  config-samsung-nevisp.armv7
 d8cdc1137e6a4ad78a3a31acc40f0c98f4db272eaf5b90ee850abb83b80916c4ff3c18a0a181e94eebead44213f6314e3363d0c4b91d95ee1adafbcad6dc57ab  android_paranoid_network.patch
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch"

device/linux-samsung-nevisp/config-samsung-nevisp.armv7

@@ -1380,8 +1380,8 @@ CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_BCMDHD_4334 is not set
-CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/bcmdhd.cal"
 # CONFIG_BCM4330 is not set
 CONFIG_BCM4334=m
 # CONFIG_BCM43241 is not set