main/linux-firmware: upgrade to 20190322, update rpi firmwares

* update rpi wifi firmware, use better source
* update rpi bluetooth firmware
* purge additional source code files

ref #9549

(cherry picked from commit 0a01a287)

main/linux-firmware/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Oliver Smith <ollieparanoid@bitmessage.ch>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-firmware
-pkgver=20181220
+pkgver=20190322
 pkgrel=0
 pkgdesc="firmware files for linux"
 #url="https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
@@ -15,26 +15,13 @@ provides="linux-firmware-any"
 provider_priority=1
 options="!strip !check !archcheck !tracedeps !spdx"
 
-# raspberry specific bt and wifi firmware
-# brcmfmac43455-sdio version 7.45.154
-# brcmfmac43430-sdio version 7.45.98.38
-_rpi_wifi=86e88fbf0345da49555d0ec34c80b4fbae7d0cd3
-# unknown version
-_rpi_bt=ade2bae1aaaebede09abb8fb546f767a0e4c7804
-_rpi_firmwares="
-	https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43430-sdio.bin
-	https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43430-sdio.txt
-	https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43455-sdio.bin
-	https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43455-sdio.clm_blob
-	https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43455-sdio.txt
-
-	https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM43430A1.hcd
-	https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM4345C0.hcd
-	"
+_rpi_bt=96eefffcccc725425fd83be5e0704a5c32b79e54
 
 source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-${pkgver}.tar.gz
-	$_rpi_firmwares
-"
+	https://community.cypress.com/servlet/JiveServlet/download/15932-1-39799/cypress-fmac-v4.14.52-2018_0928.zip
+	BCM43430A1.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM43430A1.hcd
+	BCM4345C0.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM4345C0.hcd
+	"
 
 _giturl="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
 _upload=dev.alpinelinux.org:/archive/$pkgname/
@@ -42,8 +29,8 @@ _upload=dev.alpinelinux.org:/archive/$pkgname/
 _builddir="$srcdir"/$pkgname-$pkgver
 
 # Put /lib/firmware/* folders in subpackages
-_folders="3com acenic adaptec advansys amd-ucode amdgpu ar3k ath10k ath6k
-	ath9k_htc atmel atusb av7110 bnx2 bnx2x brcm cadence carl9170fw cavium cis
+_folders="3com acenic adaptec advansys amd amd-ucode amdgpu ar3k ath10k ath6k
+	ath9k_htc atmel atusb av7110 bnx2 bnx2x brcm cadence cavium cis
 	cpia2 cxgb3 cxgb4 dabusb dpaa2 dsp56k e100 edgeport emi26 emi62 ene-ub6250 ess
 	go7007 i915 imx intel isci kaweth keyspan keyspan_pda korg libertas liquidio
 	matrox mediatek mellanox microchip moxa mrvl mwl8k mwlwifi myricom netronome
@@ -78,12 +65,32 @@ package() {
 	cd "${_builddir}"
 	make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install
 
-	local fw; for fw in $_rpi_firmwares; do
-		install -Dm 644 $srcdir/${fw##*/} \
-		    "$pkgdir"/lib/firmware/brcm/"${fw##*/}"
+	# add compat links for pre-5.0 kernel
+	ln -s brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt "$pkgdir"/lib/firmware/brcm/brcmfmac43455-sdio.txt
+	ln -s brcmfmac43430-sdio.raspberrypi,3-model-b.txt      "$pkgdir"/lib/firmware/brcm/brcmfmac43430-sdio.txt
+
+	local fw; for fw in $source; do
+		local _f=${fw%::*}
+		case $_f in
+		*.hcd*)
+			install -Dm 644 $srcdir/$_f \
+				"$pkgdir"/lib/firmware/brcm/"${_f%.*}"
+			;;
+		*.zip)
+			unzip -p $srcdir/${fw##*/} "cypress-firmware-*.tar.gz" | \
+				tar xzv -C "$pkgdir"/lib/firmware/brcm/ \
+					--wildcards --strip-components=1 \
+					"*.bin" "*.clm_blob"
+			;;
+		esac
 	done
 
 	rm -f "${pkgdir}/usr/lib/firmware/{Makefile,README,configure,GPL-3}"
+
+	rm -r "${pkgdir}/lib/firmware/carl9170fw/"
+	find "${pkgdir}" \( -name '*.S' -or -name '*.asm' -or \
+		-name '*.c' -or -name '*.h' -or -name '*.pl' -or \
+                -name 'Makefile' \) -exec rm -- {} \;
 }
 
 _folder() {
@@ -134,11 +141,7 @@ none() {
 }
 
 
-sha512sums="4b5626debe3cc5c8447fcefdcf481d97791b30929ee27eb421e70822994c532fc368eda46442def583f4d5fb9238c777a05ec687c4e598b94b90cd8a9a822c47  linux-firmware-20181220.tar.gz
-6c60b5c6df7265b9daa5dad6e409ed27fa8f4d3b2e80500d5af73d47dba9d00b2e384f43f086cb3d6b594412463857733bce78af623c573a200308508321bb25  brcmfmac43430-sdio.bin
-d3c9ae08bbb2323b4737d65a0416702c92eb52f9c395c8da6be00eb2f1d68efcb2dcb88e357adaf2130dafab32378b13d0a56c37bb647af145e5029e23744e08  brcmfmac43430-sdio.txt
-7d3cf1a98c150aee10290edfd9bfb1fc30a7aa2ae23cd7b7f56822758334995bf24a9a0d81ef00fe5670c69940b82def890f404d93d8dc4c330ee21e90dba1fb  brcmfmac43455-sdio.bin
-a32cd00a1b3f6d10d3bc6fa15e6c5ae167e90514e9f9436bd3796f9c7df6135cbaa580c56ad236982ff0ca815e6c04b12495ba370308049c98dfbba808985862  brcmfmac43455-sdio.clm_blob
-901d839f6cb14512902584d75e5c6c1738cb7712ce701d1b57264d64dd084080a293c7326fa347c544b571ea0f8113304ebe048ec907546f07fe42891f357c47  brcmfmac43455-sdio.txt
-a7b37bce092367125e390017bb0329c3b7f8fa891cf30d422ee73ce53d0592d4ff0fc2e2a94a87eefb641d5dd8631fae1cc46664224dea987ca04b68a8af8519  BCM43430A1.hcd
-2e91c6e7f79fa5c33bc103614311656631b4c595e5a25cdbee048aa810244f604b0bbae0e6f4e9294a0c332401f8347549a42424c19a27580b3cdc9f6b9f8e2c  BCM4345C0.hcd"
+sha512sums="d88837cf6d5674294cc78b946f97b9ecdf2a1beae00d6e9df0a60573ac720814240643c729ae9672591263bf796e966824239c5c93a29a606511c48352b83a3f  linux-firmware-20190322.tar.gz
+cc423a6b1ca2fab5a05577d98a732668d1e30fd39ce65e3b12692bc8bda26295249944e44081e6a476fb4d695ebe65afd6fb0fe90fc5f2a00a21d7e0d9b9962c  cypress-fmac-v4.14.52-2018_0928.zip
+a7b37bce092367125e390017bb0329c3b7f8fa891cf30d422ee73ce53d0592d4ff0fc2e2a94a87eefb641d5dd8631fae1cc46664224dea987ca04b68a8af8519  BCM43430A1.hcd.96eefffc
+83015026e740cbe14a3991bf751eb7aba6aeaab1835c0252c449376b2700d87f8d24e1f4dd2317fbb333665907ba5760db9d858ac06e2d357e1add944e1dbc2d  BCM4345C0.hcd.96eefffc"