From 9208f1f199ceceae99403e48b45c0ce6a38a8d79 Mon Sep 17 00:00:00 2001
From: Tomas Safarik <safarik@server.cz>
Date: Mon, 11 Sep 2017 18:20:34 +0200
Subject: [PATCH] [samsung-i9100] add wifi firmware (#514)

* add firmware for samsung-i9100
* add firmware package as dependecy for device package
* set kernel config for postmarketos firmware location
---
 device/device-samsung-i9100/APKBUILD          |  2 +-
 device/linux-samsung-i9100/APKBUILD           |  4 +-
 .../config-samsung-i9100.armhf                |  4 +-
 firmware/firmware-samsung-i9100/APKBUILD      | 37 +++++++++++++++++++
 4 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 firmware/firmware-samsung-i9100/APKBUILD

diff --git a/device/device-samsung-i9100/APKBUILD b/device/device-samsung-i9100/APKBUILD
index cbc6dfdd5..e58253a0a 100644
--- a/device/device-samsung-i9100/APKBUILD
+++ b/device/device-samsung-i9100/APKBUILD
@@ -5,7 +5,7 @@ pkgdesc="Samsung Galaxy SII"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-samsung-i9100"
+depends="linux-samsung-i9100 firmware-samsung-i9100"
 makedepends=""
 install=""
 subpackages=""
diff --git a/device/linux-samsung-i9100/APKBUILD b/device/linux-samsung-i9100/APKBUILD
index bac54a97a..a58b38b9c 100644
--- a/device/linux-samsung-i9100/APKBUILD
+++ b/device/linux-samsung-i9100/APKBUILD
@@ -24,7 +24,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=7
+pkgrel=8
 arch="armhf"
 pkgdesc="Samsung Galaxy SII kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_samsung_smdk4412"
@@ -123,6 +123,6 @@ package() {
 }
 
 sha512sums="1cfaabb03669854037312d708731396ffd4592771fdb01d3b652c6ff7ebc05eebd7a93e7634595148d420e781262a369206008a9f1ed62bdb1a7738b2baa8fa2  linux-samsung-i9100-349a3e91e76d17e67ef6213e1f6712e700695631.tar.gz
-7ce82e81ca8d472f01f8097e3a434fe0130d66b16b29ed3d4c5ce94870fb4efe3b5e79523802b078fcdc737e5a1ee6351bc8427d1271a098eab8e9f35b95e6b1  config-samsung-i9100.armhf
+4e3901f5b8de0f97cc1e1e78b2f4e5fa639cbe6c236ae6ba8bd4e6080f2251fe5c1dc058b552d45cc5d34f608df5578e4a2655d9715ffeea9ff4c83bd977f09d  config-samsung-i9100.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 dd4094d5f4ec281d32f12af88cb22a782e497c8e52f69cf60b73ac7d6171fc95f1f8040b3d0ad2ff3f016d22ac1d91c5b522e5d03203534a76742bc55a082af5  init"
diff --git a/device/linux-samsung-i9100/config-samsung-i9100.armhf b/device/linux-samsung-i9100/config-samsung-i9100.armhf
index 9e504404b..617c90d58 100644
--- a/device/linux-samsung-i9100/config-samsung-i9100.armhf
+++ b/device/linux-samsung-i9100/config-samsung-i9100.armhf
@@ -1417,8 +1417,8 @@ CONFIG_BCM4330=y
 # CONFIG_BCM4354 is not set
 # CONFIG_BCM43241 is not set
 CONFIG_BROADCOM_WIFI=y
-CONFIG_BCMDHD_FW_PATH="/system/etc/wifi/bcmdhd_sta.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/nvram_net.txt"
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd_sta.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/nvram_net.txt"
 CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
 CONFIG_WLAN_REGION_CODE=100
 # CONFIG_HOSTAP is not set
diff --git a/firmware/firmware-samsung-i9100/APKBUILD b/firmware/firmware-samsung-i9100/APKBUILD
new file mode 100644
index 000000000..c6fb2fa5e
--- /dev/null
+++ b/firmware/firmware-samsung-i9100/APKBUILD
@@ -0,0 +1,37 @@
+_files="
+	bcmdhd_apsta.bin
+	bcmdhd_mfg.bin
+	bcmdhd_p2p.bin
+	bcmdhd_sta.bin
+	nvram_mfg.txt
+	nvram_mfg.txt_murata
+	nvram_net.txt
+	nvram_net.txt_murata
+"
+
+pkgname=firmware-samsung-i9100
+pkgver=1
+pkgrel=0
+pkgdesc="Samsung Galaxy S II Firmware"
+url="https://github.com/TheMuppets/proprietary_vendor_samsung"
+arch="noarch"
+license="proprietary"
+depends=""
+makedepends=""
+install=""
+subpackages=""
+for _i in $_files; do source="$source https://github.com/TheMuppets/proprietary_vendor_samsung/raw/cm-14.1/i9100/proprietary/system/etc/wifi/$_i"; done
+options="!check"
+
+package() {
+	mkdir -p $pkgdir/lib/firmware/postmarketos
+	for _i in $_files; do install -D -m644 "$srcdir/$_i" "$pkgdir/lib/firmware/postmarketos/$_i"; done
+}
+sha512sums="71ae0d6b87e2541b614fe2d964db239a2d0d158a89b2a96b508195977d7c348ce892717a8b836d5b4cd173430171b81a04b4346968331da1b0eb37cc962de4f3  bcmdhd_apsta.bin
+df1a56ce3b4c3e069eaa57251d5e288e330af0525eb0e36e7375e0b675a040995ca2804103446cb0135cc4952eec449dc0a6398ab1fd01c59533484688186873  bcmdhd_mfg.bin
+a6d602a768e8748c44b5debf2b7388d42c909919fb2b73c0f511ac2bceadac7d7208c6ba94c2df9aa900c9fb446f35f670b0adc552689f8567fa87ded754a947  bcmdhd_p2p.bin
+a6d602a768e8748c44b5debf2b7388d42c909919fb2b73c0f511ac2bceadac7d7208c6ba94c2df9aa900c9fb446f35f670b0adc552689f8567fa87ded754a947  bcmdhd_sta.bin
+f8d8ad3c91d5f25cb5b17717d9f27f44b16b20ebe2e41fce1987f48f49f22edbcc7afb0aba2fc0c698538f940507a8156d403c2ac6a6fb6e77ef22264c7ce9cf  nvram_mfg.txt
+cefb1d2f68594dbfab7ecbef5972e477a6c92c411ea919855276963e5f0870f5a1006d81e8fb235cc9f146959512fd9afecfde74d9720451f94a4409839d40b2  nvram_mfg.txt_murata
+4a473740dfb3202e77fdd07c0bfe59c3cd2ea30e3388b7a09c38484408d9253b7e83a96558995e1fce87e00d6a071eec49ee5a10d68c0e05ab6b6a3dd873604e  nvram_net.txt
+b883699dfdb9d5820f65c79cbef1389ad8f648ef37b3d3d537c067cfe8ea6f6f76e95541c338e046988ce33269692274fae3469142c5ec7e0dc1b35e09deb0b1  nvram_net.txt_murata"