Merge branch 'samsung-nevisp' of gitlab.com:fsmnarmosta/pmaports into samsung-nevisp

device/device-samsung-nevisp/APKBUILD

@@ -4,7 +4,11 @@
 pkgname="device-samsung-nevisp"
 pkgdesc="Samsung Galaxy Fame GT-S6810P"
 pkgver=0.2
+<<<<<<< HEAD
 pkgrel=5
+=======
+pkgrel=0
+>>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,6 +17,11 @@ depends="postmarketos-base linux-samsung-nevisp mkbootimg mesa-dri-swrast msm-fb
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
+<<<<<<< HEAD
+=======
+	nvram_net.txt
+	bcmdhd_sta.bin_b2
+>>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
 	modules-load.conf"
 
 build() {
@@ -22,7 +31,20 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 	install -Dm644 "$srcdir"/modules-load.conf \
+<<<<<<< HEAD
 		"$pkgdir"/etc/modules-load.d/00-$pkgname.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
+>>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
 }
 
 nonfree_firmware() {
@@ -32,4 +54,9 @@ nonfree_firmware() {
 }
 
 sha512sums="233d1fca39301b3ba995b6ae9a52aa19d7124efd2f452009f828d1fe0ae88fcde98a46257990adf75281d8cf99b3bf1d24c30ff949393e54f4f0e6a55a35734e  deviceinfo
+<<<<<<< HEAD
+=======
+46a5ef749a2bdf7e4a4ec7efceae10f892b69fa2fdf22c778f3580e63b9c191ca30ec24eae3dbd447d05d8081ef2052188f1f7c8ad0c466f61f9b24388ddb130  nvram_net.txt
+5beb067b5d84e7979911100605e0ee6027b8c62249983d3c2720d19e3b9746645613356d0a6fec10757cc4e4db5f0fce1fc8c8809f91dc49cf32edb08d377cca  bcmdhd_sta.bin_b2
+>>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
 0aa06f2147be0ce89fb1ae418abff809ffa8de677afce4e3b29926ccea66f776065d2bb95675a8692230e40e57ec2ce657d9b3f79be56f1db35f4a724a3484f9  modules-load.conf"

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,11 @@
 
 pkgname="linux-samsung-nevisp"
 pkgver=3.0.101
+<<<<<<< HEAD
 pkgrel=3
+=======
+pkgrel=1
+>>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
 pkgdesc="Samsung Galaxy Fame GT-S6810P kernel fork"
 arch="armv7"
 _carch="arm"