alarm/firmware-raspberrypi to 20201225-2

Restore legacy 6-1 files and just add new ones which I believe correspond
to the RPi 400.

alarm/firmware-raspberrypi/PKGBUILD

@@ -1,51 +1,43 @@
 # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
+# Maintainer: graysky <graysky@archlnux.us>
 
 buildarch=28
 
 pkgname=firmware-raspberrypi
 _firmcommit=b66ab26cebff689d0d3257f56912b9bb03c20567
-_bluecommit=09eeca34619a1691ad2983d355a9301db75f0456
 pkgver=20201225
-pkgrel=1
+pkgrel=2
 pkgdesc="Additional firmware for Raspberry Pi"
 arch=('any')
 url="https://github.com/RPi-Distro/firmware-nonfree/commits/master/brcm"
 license=('custom')
 options=('!strip')
-source=("nonfree-$pkgver-${_firmcommit:0:10}.tar.gz::https://github.com/RPi-Distro/firmware-nonfree/archive/${_firmcommit}.tar.gz"
-        "bluez-$pkgver-${_bluecommit:0:10}.tar.gz::https://github.com/RPi-Distro/bluez-firmware/archive/${_bluecommit}.tar.gz"
+source=('https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.bin'
+        'https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.txt'
+        'https://archlinuxarm.org/builder/src/bcm43430/BCM43430A1.hcd'
+        'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.bin'
+        'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.clm_blob'
+        'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.txt'
+        'https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd'
+        "brcmfmac43456-sdio.bin::https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.bin"
+        "brcmfmac43456-sdio.clm_blob::https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.clm_blob"
+        "brcmfmac43456-sdio.txt::https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.txt"
         'RPi-WM8804.conf')
-sha256sums=('033a21d19fbdc7617b8c5b58d4be5951e29be5be787a45875b615f4d4dcf3f5b'
-            '1e9d81592f18b3288f53b83e652fa2139100012d3c74974f63b013ff510e791f'
+
+sha256sums=('996b7ef7cbdb8ea3855fa516acb57630ff03a449fd3bb23e84789f2f04b4faf5'
+            'e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0'
+            '8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930'
+            '0f1817f50649df707f521dec9f2d5905e4c01939c8aabfa9a06b2ce0a36952ee'
+            '8e2250518bc789e53109728c3c0a6124bc3801a75a1cb4966125753cf1f0252e'
+            '27c6b39f113f94a8c15eae63f8605e043332775c469ea072bf325773bb9ae553'
+            '1788c58ecedd61b380e0dd120844ed61e5fbbea0a58e84e6293685eb3384fddc'
+            'ddf83f2100885b166be52d21c8966db164fdd4e1d816aca2acc67ee9cc28d726'
+            '2dbd7d22fc9af0eb560ceab45b19646d211bc7b34a1dd00c6bfac5dd6ba25e8a'
+            '44e0bb322dc1f39a4b0a89f30ffdd28bc93f7d7aaf534d06d229fe56f6198194'
             'f978fbc40db75ba3213a4472023496d0716706eb1a6f078f207ac027c5753f43')
 
 package() {
   install -d "$pkgdir/usr/lib/firmware/updates/brcm" "$pkgdir/usr/share/alsa/cards/"
+  install -m 0644 -- *.bin *.txt *.clm_blob *.hcd "${pkgdir}/usr/lib/firmware/updates/brcm"
   install -m 0644 RPi-WM8804.conf "$pkgdir/usr/share/alsa/cards/"
-
-  _bluez=(
-    BCM43430A1.hcd
-    BCM4345C0.hcd
-  )
-  for i in "${_bluez[@]}"; do
-    install -m 0644 "bluez-firmware-$_bluecommit/broadcom/$i" "$pkgdir/usr/lib/firmware/updates/brcm/$i"
-  done
-
-  # BCM43430 on Zero/3A/3B
-  # BCM43455 on 3A+/3B+/4B/CM4
-  # BCM43456 on 400
-
-  _payload=(
-    brcmfmac43430-sdio.bin
-    brcmfmac43430-sdio.txt
-    brcmfmac43455-sdio.bin
-    brcmfmac43455-sdio.clm_blob
-    brcmfmac43455-sdio.txt
-    brcmfmac43456-sdio.bin
-    brcmfmac43456-sdio.clm_blob
-    brcmfmac43456-sdio.txt
-  )
-  for i in "${_payload[@]}"; do
-    install -m 0644 "firmware-nonfree-$_firmcommit/brcm/$i" "$pkgdir/usr/lib/firmware/updates/brcm/$i"
-  done
 }