From ab02b3416e7f4436e911f5708f041a84c618c5e9 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Sun, 21 Jun 2020 14:31:50 +0200
Subject: [PATCH] firmware/firmware-samsung-u8500: rename from
 firmware-samsung-golden (MR 1424)

samsung-skomer basically uses the same BCM4334 WiFi/BT chip as
samsung-golden, and the WiFi/BT firmware is also the same.

There seems to be a slightly different NVRAM file, so we package
that just to do things properly.
---
 device/testing/device-samsung-golden/APKBUILD |  4 +--
 .../testing/firmware-samsung-golden/APKBUILD  | 25 ---------------
 .../testing/firmware-samsung-u8500/APKBUILD   | 32 +++++++++++++++++++
 3 files changed, 34 insertions(+), 27 deletions(-)
 delete mode 100644 device/testing/firmware-samsung-golden/APKBUILD
 create mode 100644 device/testing/firmware-samsung-u8500/APKBUILD

diff --git a/device/testing/device-samsung-golden/APKBUILD b/device/testing/device-samsung-golden/APKBUILD
index e5a06824d..6cb0eff6b 100644
--- a/device/testing/device-samsung-golden/APKBUILD
+++ b/device/testing/device-samsung-golden/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-golden
 pkgdesc="Samsung Galaxy S III mini"
 pkgver=1
-pkgrel=7
+pkgrel=8
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -57,7 +57,7 @@ kernel_mainline() {
 
 nonfree_firmware() {
 	pkgdesc="WiFi/BT firmware"
-	depends="firmware-samsung-golden"
+	depends="firmware-samsung-u8500"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-samsung-golden/APKBUILD b/device/testing/firmware-samsung-golden/APKBUILD
deleted file mode 100644
index 96481358f..000000000
--- a/device/testing/firmware-samsung-golden/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=firmware-samsung-golden
-pkgver=2
-pkgrel=0
-pkgdesc="Firmware for Samsung Galaxy S III mini"
-url="https://pepethekingprawn.gitlab.io/firmware/"
-arch="armv7"
-license="proprietary"
-options="!check !strip !archcheck"
-source="https://pepethekingprawn.gitlab.io/firmware/GT-I8190.tar.xz"
-builddir="$srcdir"
-
-_fwdir="/lib/firmware/postmarketos"
-
-package() {
-	# WiFi
-	install -Dm644 bcmdhd_sta.bin_b2 \
-		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.bin
-	install -Dm644 nvram_net.txt_GPIO4 \
-		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.samsung,golden.txt
-
-	# Bluetooth
-	install -Dm644 bcm4334.hcd "$pkgdir/$_fwdir"/brcm/BCM4334B0.hcd
-}
-
-sha512sums="d9ad7a2d593ecef40252e85fd0d2b65d54aaed911e80c516f211573a8f42d9fc18303d7c2b55dd37e5027ca8bc42289b5dbccb9008ab20f902f30e4394704912  GT-I8190.tar.xz"
diff --git a/device/testing/firmware-samsung-u8500/APKBUILD b/device/testing/firmware-samsung-u8500/APKBUILD
new file mode 100644
index 000000000..cee67d233
--- /dev/null
+++ b/device/testing/firmware-samsung-u8500/APKBUILD
@@ -0,0 +1,32 @@
+pkgname=firmware-samsung-u8500
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Samsung Galaxy devices based on ST-Ericsson U8500"
+url="https://pepethekingprawn.gitlab.io/firmware/"
+arch="armv7"
+license="proprietary"
+options="!check !strip !archcheck"
+_skomer_commit="6d88d78e23aaf27cb662c17766ca813a457c106e"
+source="https://pepethekingprawn.gitlab.io/firmware/GT-I8190.tar.xz
+	nvram_net-skomer-$_skomer_commit.txt::https://raw.githubusercontent.com/flxo/android_vendor_samsung_skomer/$_skomer_commit/proprietary/etc/wifi/nvram_net.txt
+	"
+builddir="$srcdir"
+replaces="firmware-samsung-golden"
+
+_fwdir="/lib/firmware/postmarketos"
+
+package() {
+	# WiFi
+	install -Dm644 bcmdhd_sta.bin_b2 \
+		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.bin
+	install -Dm644 nvram_net.txt_GPIO4 \
+		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.samsung,golden.txt
+	install -Dm644 nvram_net-skomer.txt \
+		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.samsung,skomer.txt
+
+	# Bluetooth
+	install -Dm644 bcm4334.hcd "$pkgdir/$_fwdir"/brcm/BCM4334B0.hcd
+}
+
+sha512sums="d9ad7a2d593ecef40252e85fd0d2b65d54aaed911e80c516f211573a8f42d9fc18303d7c2b55dd37e5027ca8bc42289b5dbccb9008ab20f902f30e4394704912  GT-I8190.tar.xz
+02aecf00166d4ae70cf73dae8e73d84bfd82f863a25ef42b88f3d53dab3b5e983054a8becb4b75fddb32a7df2d6fa8ad8d7e0a5651422fe48f762877428ee2d9  nvram_net-skomer-6d88d78e23aaf27cb662c17766ca813a457c106e.txt"