From: Henry Ptasinski Date: Fri, 8 Apr 2011 14:51:13 +0000 (-0700) Subject: linux-firmware: Removed codeversion from brcm firmware filenames. X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=a531257c40920de0161150091eaccbbc1182eb96;p=linux-firmware linux-firmware: Removed codeversion from brcm firmware filenames. The basename-apiversion-codeversion construction for firmware filenames is not used by most other firmware files, adds complexity, and is not providing any value. Renamed the firmware files using just basename-apiversion and fixed WHENCE to have correct names and path to these files. Signed-off-by: Henry Ptasinski Signed-off-by: David Woodhouse --- diff --git a/WHENCE b/WHENCE index 88d7722..b240756 100644 --- a/WHENCE +++ b/WHENCE @@ -1433,19 +1433,19 @@ Licence: -------------------------------------------------------------------------- -Driver: brcm80211 - Broadcom 802.11n wireless LAN driver. +Driver: brcmsmac - Broadcom 802.11n softmac wireless LAN driver. -File: brcm/bcm43xx-0-610-809-0.fw -File: brcm/bcm43xx_hdr-0-610-809-0.fw +File: brcm/bcm43xx-0.fw +File: brcm/bcm43xx_hdr-0.fw Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details. -------------------------------------------------------------------------- -Driver: brcm80211 - Broadcom 802.11n wireless LAN driver. +Driver: brcmfmac - Broadcom 802.11n fullmac wireless LAN driver. -File: bcm4329-fullmac-4-218-248-5.bin -File: bcm4329-fullmac-4-218-248-5.txt +File: brcm/bcm4329-fullmac-4.bin +File: brcm/bcm4329-fullmac-4.txt Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details. diff --git a/brcm/bcm4329-fullmac-4-218-248-5.bin b/brcm/bcm4329-fullmac-4-218-248-5.bin deleted file mode 100644 index fcd41c3..0000000 Binary files a/brcm/bcm4329-fullmac-4-218-248-5.bin and /dev/null differ diff --git a/brcm/bcm4329-fullmac-4-218-248-5.txt b/brcm/bcm4329-fullmac-4-218-248-5.txt deleted file mode 100644 index f757f55..0000000 --- a/brcm/bcm4329-fullmac-4-218-248-5.txt +++ /dev/null @@ -1,94 +0,0 @@ -# bcm94329sdagb board -# $Copyright (C) 2008 Broadcom Corporation$ -# $id$ - -sromrev=3 -vendid=0x14e4 -devid=0x432e -# board type -boardtype=0x4ff - -# board revision 1.1 -boardrev=0x19 - -# boardflags -boardflags=0x1200 - -####### IMP ######## -# Specify the xtalfreq if it is otherthan 38.4MHz -xtalfreq=38400 - -aa2g=1 -aa5g=1 - -ag0=255 - -# 11g paparams -pa0b0=6003,6003,5112 -pa0b1=64086,64086,64229 -pa0b2=65195,65195,65081 -pa0itssit=62 -pa0maxpwr=66 -opo=0 -mcs2gpo0=0x2222 -mcs2gpo1=0x2222 - -# sel = 1 : 20% evm sel = 2 : 27% evm sel = 3 : 16% evm -cckdigfilttype=0 -ofdmdigfilttype=1 - -# 11a paparams lowband -pa1lob0=5662 -pa1lob1=64130 -pa1lob2=65156 -# paparams midband -pa1b0=5724 -pa1b1=64128 -pa1b2=65167 -#paparams high band -pa1hib0=5675 -pa1hib1=64129 -pa1hib2=65169 -pa1itssit=62 -pa1maxpwr=66 -opo=0 -mcs5gpo=0x22222222 - -# 11g rssi params -rssismf2g=0xa -rssismc2g=0xb -rssisav2g=0x3 -bxa2g=0 - -# 11a rssi params -rssismf5g=0xa -rssismc5g=0xa -rssisav5g=0x3 -bxa2g=0 - -# country code -ccode=X2 -cctl=0x0 - -rxpo2g=1 -rxpo5g=0 -rxpo2gchnflg=0x1FFF - -boardnum=2048 -macaddr=00:90:4c:c5:34:23 - -####### -nocrc=1 - -#for mfgc -otpimagesize=182 - -# sdio extra configs -hwhdr=0x05ffff031030031003100000 - -#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. -RAW1=80 02 fe ff - -#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. -#RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A -nvramver=4.218.0.0 diff --git a/brcm/bcm4329-fullmac-4.bin b/brcm/bcm4329-fullmac-4.bin new file mode 100644 index 0000000..fcd41c3 Binary files /dev/null and b/brcm/bcm4329-fullmac-4.bin differ diff --git a/brcm/bcm4329-fullmac-4.txt b/brcm/bcm4329-fullmac-4.txt new file mode 100644 index 0000000..f757f55 --- /dev/null +++ b/brcm/bcm4329-fullmac-4.txt @@ -0,0 +1,94 @@ +# bcm94329sdagb board +# $Copyright (C) 2008 Broadcom Corporation$ +# $id$ + +sromrev=3 +vendid=0x14e4 +devid=0x432e +# board type +boardtype=0x4ff + +# board revision 1.1 +boardrev=0x19 + +# boardflags +boardflags=0x1200 + +####### IMP ######## +# Specify the xtalfreq if it is otherthan 38.4MHz +xtalfreq=38400 + +aa2g=1 +aa5g=1 + +ag0=255 + +# 11g paparams +pa0b0=6003,6003,5112 +pa0b1=64086,64086,64229 +pa0b2=65195,65195,65081 +pa0itssit=62 +pa0maxpwr=66 +opo=0 +mcs2gpo0=0x2222 +mcs2gpo1=0x2222 + +# sel = 1 : 20% evm sel = 2 : 27% evm sel = 3 : 16% evm +cckdigfilttype=0 +ofdmdigfilttype=1 + +# 11a paparams lowband +pa1lob0=5662 +pa1lob1=64130 +pa1lob2=65156 +# paparams midband +pa1b0=5724 +pa1b1=64128 +pa1b2=65167 +#paparams high band +pa1hib0=5675 +pa1hib1=64129 +pa1hib2=65169 +pa1itssit=62 +pa1maxpwr=66 +opo=0 +mcs5gpo=0x22222222 + +# 11g rssi params +rssismf2g=0xa +rssismc2g=0xb +rssisav2g=0x3 +bxa2g=0 + +# 11a rssi params +rssismf5g=0xa +rssismc5g=0xa +rssisav5g=0x3 +bxa2g=0 + +# country code +ccode=X2 +cctl=0x0 + +rxpo2g=1 +rxpo5g=0 +rxpo2gchnflg=0x1FFF + +boardnum=2048 +macaddr=00:90:4c:c5:34:23 + +####### +nocrc=1 + +#for mfgc +otpimagesize=182 + +# sdio extra configs +hwhdr=0x05ffff031030031003100000 + +#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. +RAW1=80 02 fe ff + +#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. +#RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A +nvramver=4.218.0.0 diff --git a/brcm/bcm43xx-0-610-809-0.fw b/brcm/bcm43xx-0-610-809-0.fw deleted file mode 100644 index e4ba3ad..0000000 Binary files a/brcm/bcm43xx-0-610-809-0.fw and /dev/null differ diff --git a/brcm/bcm43xx-0.fw b/brcm/bcm43xx-0.fw new file mode 100644 index 0000000..e4ba3ad Binary files /dev/null and b/brcm/bcm43xx-0.fw differ diff --git a/brcm/bcm43xx_hdr-0-610-809-0.fw b/brcm/bcm43xx_hdr-0-610-809-0.fw deleted file mode 100644 index 661b6bd..0000000 Binary files a/brcm/bcm43xx_hdr-0-610-809-0.fw and /dev/null differ diff --git a/brcm/bcm43xx_hdr-0.fw b/brcm/bcm43xx_hdr-0.fw new file mode 100644 index 0000000..661b6bd Binary files /dev/null and b/brcm/bcm43xx_hdr-0.fw differ