From c9ecca715de4ddb0b493edac7e169cdec48736a4 Mon Sep 17 00:00:00 2001
From: rrooij <rrooij@users.noreply.github.com>
Date: Sat, 9 Dec 2017 17:44:37 +0100
Subject: [PATCH] i9505: add wifi firmware (#992)

Add the wifi firmware for bcm4335. This is the blob that is being used
in LineageOS/CyanogenMod 14.1.
---
 device/device-samsung-i9505/APKBUILD          |  4 ++--
 device/linux-samsung-i9505/APKBUILD           |  4 ++--
 .../config-samsung-i9505.armhf                |  4 ++--
 firmware/firmware-samsung-i9505/APKBUILD      | 23 +++++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 firmware/firmware-samsung-i9505/APKBUILD

diff --git a/device/device-samsung-i9505/APKBUILD b/device/device-samsung-i9505/APKBUILD
index 0b4f6abaf..b701070b2 100644
--- a/device/device-samsung-i9505/APKBUILD
+++ b/device/device-samsung-i9505/APKBUILD
@@ -1,12 +1,12 @@
 pkgname="device-samsung-i9505"
 pkgdesc="Samsung Galaxy S4 International"
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="linux-samsung-i9505 mkbootimg"
+depends="linux-samsung-i9505 firmware-samsung-i9505 mkbootimg"
 source="deviceinfo 90-android-sec_touchscreen.rules"
 
 package() {
diff --git a/device/linux-samsung-i9505/APKBUILD b/device/linux-samsung-i9505/APKBUILD
index e817a37f1..8526504f8 100644
--- a/device/linux-samsung-i9505/APKBUILD
+++ b/device/linux-samsung-i9505/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-i9505"
 pkgver=3.4.112
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy S4 International kernel fork"
 arch="armhf"
 _carch="arm"
@@ -80,7 +80,7 @@ package() {
 }
 
 sha512sums="7b73724636d9fb2a19e6405b1c6acd9f08020cb2d8c51f209eab2dea90616f15e88e96cdea62931864a6a3f6d4ad1c0b0b9b5cae3e3a690c20f5a9dcb4b33d82  linux-samsung-i9505-e8d93e03563e42d7c762d4e9a87d77115102b301.tar.gz
-c6058d928f5f98f3f52df573b1f401ca026309756d93ae664b946489a3c9bee328f078cf2ba5ee0bcc25db637aabe2332f2dba7e2340d236e03ca0e15345a4e7  config-samsung-i9505.armhf
+9ee6b6726140b1c6136b8fac3e1e72875d1ae62f65d0996c4a462082ea1d63cadfe6e63b34f9fd8512e1c98b447fdab10d4a75a4d8faf78400f73d91d5440adb  config-samsung-i9505.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 36418ec3d31d1d6d9915afcf3d38d4549aeeb49c3825414b51b67db7a1ab6482f22d2723da3b258b671956809949278a51f6507df9b0052aec0bd0c59f56919a  patch_lifebook_detect.patch
diff --git a/device/linux-samsung-i9505/config-samsung-i9505.armhf b/device/linux-samsung-i9505/config-samsung-i9505.armhf
index 7236fcced..b5001da08 100644
--- a/device/linux-samsung-i9505/config-samsung-i9505.armhf
+++ b/device/linux-samsung-i9505/config-samsung-i9505.armhf
@@ -1530,8 +1530,8 @@ CONFIG_BCM4335=y
 # CONFIG_BCM4339 is not set
 # CONFIG_BCM4354 is not set
 # CONFIG_BCM43241 is not set
-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_BCM4335BT=y
 CONFIG_WLAN_REGION_CODE=400
diff --git a/firmware/firmware-samsung-i9505/APKBUILD b/firmware/firmware-samsung-i9505/APKBUILD
new file mode 100644
index 000000000..b62ac06ea
--- /dev/null
+++ b/firmware/firmware-samsung-i9505/APKBUILD
@@ -0,0 +1,23 @@
+pkgname=firmware-samsung-i9505
+pkgver=1
+pkgrel=0
+pkgdesc="Samsung Galaxy S4 International Firmware"
+url="https://github.com/flo071/proprietary_vendor_samsung_jf-common"
+arch="noarch"
+license="proprietary"
+options="!check !strip"
+
+# Source
+_commit="af95c8f4af9fda8b909579dafc30ec1ce29cb12d"
+source=$pkgname-$_commit.tar.gz::$url"/archive/${_commit}.tar.gz"
+
+package() {
+	cd "$srcdir/proprietary_vendor_samsung_jf-common-${_commit}/proprietary/"
+
+	# Wifi
+	install -Dm644 "etc/wifi/bcmdhd_sta.bin" \
+		"$pkgdir/lib/firmware/postmarketos/bcmdhd_sta.bin"
+	install -Dm644 "etc/wifi/nvram_net.txt" \
+		"$pkgdir/lib/firmware/postmarketos/nvram_net.txt"
+}
+sha512sums="b8b92806123b4ab5c02adfb1e33ad18a84a51f181485f7fffe51a6d60678b9750c3bc461550b0a3afde99b4685c8720b0b8be3626f68a284863cb10e3c68c7c5  firmware-samsung-i9505-af95c8f4af9fda8b909579dafc30ec1ce29cb12d.tar.gz"