alarm/firmware-raspberrypi to 20221027-1

Provide cypress dir and create symlink there in cyfmac43455-sdio-standard.bin
which is needed for the new way upstream provides three files in bcrm dir.

For Zero-W, use upstream provided firmware
This commit is contained in:
graysky 2022-10-27 11:23:17 -04:00
parent a1a16222a8
commit 09c7b7ca1a
3 changed files with 18 additions and 103 deletions

View file

@ -3,9 +3,9 @@
# Contributor: Ray Sherwin <sliick517d@gmail.com>
pkgname=firmware-raspberrypi
_firmcommit=b0be2de82bc55d3f36a944538857d891340dbc2c
_bluezcommit=3b108c864428dda9f9833cf3346f438552d08cea
pkgver=20221026
_firmcommit=3b108c864428dda9f9833cf3346f438552d08cea
_bluezcommit=90d0bdffd25cc8a1717d3fec6cc7bbde56ee83c7
pkgver=20221027
pkgrel=1
pkgdesc="Additional firmware for Raspberry Pi"
arch=('any')
@ -21,10 +21,6 @@ source=("git+https://github.com/RPi-Distro/firmware-nonfree.git#commit=$_firmcom
"BCM4345C0.hcd::https://github.com/RPi-Distro/bluez-firmware/raw/$_bluezcommit/broadcom/BCM4345C0.hcd"
# bluetooth for Zero 2 W
"BCM43430B0.hcd::https://github.com/RPi-Distro/bluez-firmware/raw/$_bluezcommit/broadcom/BCM43430B0.hcd"
# fixes buggy linux-firmware for RPi4B
'brcmfmac43455-sdio.raspberrypi,4-model-b.txt'
# fixes buggy linux-firmware for Zero-W
'https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.txt'
'RPi-WM8804.conf')
sha256sums=('SKIP'
@ -32,8 +28,6 @@ sha256sums=('SKIP'
'c096ad4a5c3f06ed7d69eba246bf89ada9acba64a5b6f51b1e9c12f99bb1e1a7'
'c723c903655086c9f3a1de94a291f495a0f087f1ee6d3ee7bc4c558497aae7bc'
'338c2c6631131f516bfc7e64ef0872bd0402e1f98ef9d0c900eef0c814d90a25'
'edb6f4e4fb19e18940004124feb4ffe160d72fc607243a07a4480338a28b2748'
'e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0'
'f978fbc40db75ba3213a4472023496d0716706eb1a6f078f207ac027c5753f43')
package() {
@ -42,21 +36,25 @@ package() {
# https://github.com/RPi-Distro/firmware-nonfree/issues/26
unlink "$srcdir/$_FWPATH/brcm/brcmfmac43455-sdio.bin"
# install cypress dir and symlink cyfmac43455-sdio-standard.bin which debian
# packaging does, see README.txt in /cypress and comments in this commit:
# https://github.com/RPi-Distro/firmware-nonfree/commit/3b108c864428dda9f9833cf3346f438552d08cea
install -d "$srcdir/$_FWPATH/cypress" "$pkgdir"/usr/lib/firmware/updates/cypress/
install -m 0644 "$srcdir/$_FWPATH/cypress/"* "$pkgdir"/usr/lib/firmware/updates/cypress
cd "$pkgdir"/usr/lib/firmware/updates/cypress
# we can use either the -standard or -minimal files so use standard by default
ln -s cyfmac43455-sdio-standard.bin cyfmac43455-sdio.bin
cd "$srcdir"
install -d "$pkgdir"/usr/lib/firmware/updates/brcm "$pkgdir"/usr/share/alsa/cards/
install -m 0644 *.hcd "$pkgdir"/usr/lib/firmware/updates/brcm
install -m 0644 RPi-WM8804.conf "$pkgdir"/usr/share/alsa/cards/
install -m 0644 "$srcdir/$_FWPATH/brcm/"* "$pkgdir"/usr/lib/firmware/updates/brcm
rm "$pkgdir"/usr/lib/firmware/updates/brcm/{brcmfmac43430-sdio.bin,brcmfmac43430-sdio.txt}
install -m 0644 "$srcdir/$_FWPATH/cypress/"{cyfmac43455-sdio-*.bin,README.txt} "$pkgdir"/usr/lib/firmware/updates/brcm
cp -r "$srcdir/$_FWPATH/brcm/"* "$pkgdir"/usr/lib/firmware/updates/brcm
# make some symbolic links
cd "$pkgdir"/usr/lib/firmware/updates/brcm
ln -s brcmfmac43456-sdio.txt brcmfmac43456-sdio.raspberrypi,400.txt
ln -s brcmfmac43456-sdio.txt brcmfmac43456-sdio.raspberrypi,4-compute-module.txt
ln -s brcmfmac43456-sdio.txt brcmfmac43456-sdio.pine64-pinephone-pro.txt
ln -s brcmfmac43455-sdio.raspberrypi,4-model-b.txt brcmfmac43455-sdio.raspberrypi,4-compute-module.txt
ln -s BCM43430B0.hcd BCM.hcd
# see README.txt: we can use either the -standard or -minimal files so use standard by default
ln -s cyfmac43455-sdio-standard.bin brcmfmac43455-sdio.bin
}

View file

@ -1,83 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
# (C) Copyright 2018 Raspberry Pi (Trading) Ltd.
# NVRAM config file for the BCM43455 WiFi/BT chip as found on the
# Raspberry Pi 4 Model B
aa2g=1
aa5g=1
AvVmid_c0=1,165,2,100,2,100,2,100,2,100
boardflags=0x00480201
boardflags2=0x40800000
boardflags3=0x44200100
boardrev=0x1304
boardtype=0x6e4
btc_mode=1
btc_params1=0x7530
btc_params8=0x4e20
btc_params50=0x972c
cbfilttype=1
cckPwrIdxCorr=3
cckTssiDelay=150
deadman_to=481500000
devid=0x43ab
dot11agofdmhrbw202gpo=0x4442
dot11b_opts=0x3aa85
ed_thresh2g=-54
ed_thresh5g=-54
eu_edthresh2g=-54
eu_edthresh5g=-54
extpagain2g=2
extpagain5g=2
fdsslevel_ch11=6
femctrl=0
itrsw=1
ldo1=4
ltecxfnsel=0x22
ltecxgcigpio=0x32
ltecxmux=0
ltecxpadnum=0x0504
macaddr=b8:27:eb:74:f2:6c
manfid=0x2d0
maxp2ga0=80
maxp5ga0=82,82,82,82
mcsbw202gpo=0x98444422
mcsbw205ghpo=0xb9555000
mcsbw205glpo=0xb9555000
mcsbw205gmpo=0xb9555000
mcsbw402gpo=0x98444422
mcsbw405ghpo=0xb9555000
mcsbw405glpo=0xb9555000
mcsbw405gmpo=0xb9555000
mcsbw805ghpo=0xb9555000
mcsbw805glpo=0xb9555000
mcsbw805gmpo=0xb9555000
nocrc=1
ofdmlrbw202gpo=0x0022
ofdmTssiDelay=150
pa2ga0=-129,6525,-718
pa2ga1=-149,4408,-601
pa5ga0=-185,6836,-815,-186,6838,-815,-184,6859,-815,-184,6882,-818
pa5ga1=-202,4285,-574,-201,4312,-578,-196,4391,-586,-201,4294,-575
pdoffset2g40ma0=16
pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0
pdoffset40ma0=0x8888
pdoffset80ma0=0x8888
pdoffsetcckma0=2
phycal_tempdelta=15
prodid=0x06e4
rawtempsense=0x1ff
rxchain=1
sromrev=11
swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff
swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe
swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3
swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3
tssipos2g=1
tssipos5g=1
tworangetssi2g=1
tworangetssi5g=1
txchain=1
txpwr2gAdcScale=1
txpwr5gAdcScale=1
vcodivmode=1
vendid=0x14e4
xtalfreq=37400

View file

@ -5,11 +5,11 @@
# Contributer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-rpi
_commit=dbd073e4028580a09b6ee507e0c137441cb52650
_commit=7f52d634c6e810fbc704d579e8e9614d3959c575
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
pkgver=5.15.74
pkgrel=1
pkgrel=2
pkgdesc='Linux'
url="http://www.kernel.org/"
arch=(armv7h aarch64)
@ -27,7 +27,7 @@ source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/li
60-linux.hook
90-linux.hook
)
md5sums=('512d0090023950e9b8796c59f33a36d5'
md5sums=('332e975aba913fab2b8712c0f19f9ff2'
'3bab7426d8c8818dda8353da3892a41f'
'f66a7ea3feb708d398ef57e4da4815e9'
'86d4a35722b5410e3b29fc92dae15d4b'