From 7068f8c2afb6dcc0f702960f278a7d7744a28fff7aad3eb1245e25e009cdf8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 4 Jan 2017 08:21:00 +0000 Subject: [PATCH 1/2] Accepting request 448692 from home:tbechtold:branches:hardware - Add brcmfmac4329-sdio-cubox-i.txt and brcmfmac4330-sdio-cubox-i.txt . OBS-URL: https://build.opensuse.org/request/show/448692 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=6 --- bcm43xx-firmware.changes | 5 ++ bcm43xx-firmware.spec | 7 +- brcmfmac4329-sdio-cubox-i.txt | 70 ++++++++++++++++++++ brcmfmac4330-sdio-cubox-i.txt | 118 ++++++++++++++++++++++++++++++++++ install-brcmfmac.sh | 4 ++ 5 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 brcmfmac4329-sdio-cubox-i.txt create mode 100644 brcmfmac4330-sdio-cubox-i.txt diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 77bc7a6..73f5db6 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 3 21:08:25 UTC 2017 - tbechtold@suse.com + +- Add brcmfmac4329-sdio-cubox-i.txt and brcmfmac4330-sdio-cubox-i.txt . + ------------------------------------------------------------------- Tue Oct 18 13:34:43 UTC 2016 - afaerber@suse.de diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec index 9a0b78c..923f07d 100644 --- a/bcm43xx-firmware.spec +++ b/bcm43xx-firmware.spec @@ -1,7 +1,7 @@ # # spec file for package bcm43xx-firmware # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,9 @@ Url: https://community.cypress.com/community/linux Source0: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/plain/LICENCE.broadcom_bcm43xx Source1: 50-brcmfmac.conf Source2: install-brcmfmac.sh +#BCM4329/4330 +Source291: https://raw.githubusercontent.com/SolidRun/meta-solidrun-arm-imx6/fido/recipes-bsp/broadcom-nvram-config/files/solidrun-imx6/brcmfmac4329-sdio.txt#/brcmfmac4329-sdio-cubox-i.txt +Source301: https://raw.githubusercontent.com/SolidRun/meta-solidrun-arm-imx6/fido/recipes-bsp/broadcom-nvram-config/files/solidrun-imx6/brcmfmac4330-sdio.txt#/brcmfmac4330-sdio-cubox-i.txt #BCM43362 Source3621: http://dl.cubieboard.org/public/Cubieboard/benn/firmware/ap6210/nvram_ap6210.txt#/brcmfmac43362-sdio-cubietruck.txt Source3622: https://github.com/Bananian/bananian/raw/master/deb/u-boot-m2-bananian_armhf/lib/firmware/brcm/brcmfmac43362-sdio.txt#/brcmfmac43362-sdio-bananapi-m2.txt @@ -61,6 +64,8 @@ mkdir -p %{buildroot}%{_sbindir} install -c -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}/install-brcmfmac # Used by brcmfmac mkdir -p %{buildroot}/lib/firmware/brcm +install -c -m 0644 %{SOURCE291} %{buildroot}/lib/firmware/brcm/ +install -c -m 0644 %{SOURCE301} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE3621} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE3622} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE3623} %{buildroot}/lib/firmware/brcm/ diff --git a/brcmfmac4329-sdio-cubox-i.txt b/brcmfmac4329-sdio-cubox-i.txt new file mode 100644 index 0000000..6abc945 --- /dev/null +++ b/brcmfmac4329-sdio-cubox-i.txt @@ -0,0 +1,70 @@ +# bcm4329 NVRAM +# $Copyright (C) 2008 Broadcom Corporation$ +# $id$ + +sromrev=3 +vendid=0x14e4 +devid=0x432f +boardtype=0x53e + +boardrev=0x41 + +#boardflags=0x1200 +boardflags=0x200 + +# Specify the xtalfreq if it is otherthan 38.4MHz +xtalfreq=37400 + +aa2g=3 +aa5g=0 + +ag0=255 +#tri2g=0x64 + +# 11g paparams +pa0b0=5542,5542,5542 +pa0b1=64244,64244,64244 +pa0b2=65202,65202,65202 + +pa0itssit=62 +pa0maxpwr=74 +opo=0 +mcs2gpo0=0x6666 +mcs2gpo1=0x6666 + +# 11g rssi params +rssismf2g=0xa,0xa,0xa +rssismc2g=0xb,0xb,0xb +rssisav2g=0x3,0x3,0x3 +bxa2g=0 + +# country code +ccode=ALL +cctl=0x0 +cckdigfilttype=0 +ofdmdigfilttype=1 + +rxpo2g=0 + +boardnum=1 +macaddr=00:90:4c:c5:00:34 + +# xtal pu and pd time control variable +# pu time is driver default (0x1501) +#r13t=0x1501 + +####### +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.214.0 diff --git a/brcmfmac4330-sdio-cubox-i.txt b/brcmfmac4330-sdio-cubox-i.txt new file mode 100644 index 0000000..8742fc9 --- /dev/null +++ b/brcmfmac4330-sdio-cubox-i.txt @@ -0,0 +1,118 @@ +manfid=0x2d0 +prodid=0x0532 +vendid=0x14e4 +devid=0x4360 +boardtype=0x0532 +boardrev=0x20 +boardflags=0x10080201 + +nocrc=1 +xtalfreq=37400 +xtalmode=0x20,0x4,0 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +ag0=252 +ag1=252 +aa2g=1 +aa5g=1 +ccode=EU +regrev=5 + +#for BT-coexistence +btc_params80=0 +btc_params6=10 +btc_params8=10000 + +sd_gpout=0 +# sd_oobonly=1 +muxenab=0x10 + +# 2G PA param_B42R 110927 +pa0b0=0x12E4 +pa0b1=0xFE09 +pa0b2=0xFF9A +#pa0itssit=62 +rssismf2g=0xa +rssismc2g=0x3 +rssisav2g=0x7 + +# rssi params for 5GHz B42R_110803 +#rssismf5g=0x4 +rssismf5g=0xa +rssismc5g=0x7 +rssisav5g=0x1 +#PA parameters for lower band +pa1lob0=0x144F +pa1lob1=0xFD6B +pa1lob2=0xFF3B +#PA parameters for midband +pa1b0=0x139C +pa1b1=0xFD87 +pa1b2=0xFF4F +#PA parameters for high band +pa1hib0=0x12CA +pa1hib1=0xFD9A +pa1hib2=0xFF4E + +# 2G PA offset +maxp2ga0=64 +sromrev=3 +cckpo=0 +ofdm2gpo=0x66666666 +mcs2gpo0=0xaaaa +mcs2gpo1=0xaaaa + +# 5G PA offset +maxp5ga0=66 +maxp5gla0=66 +maxp5gha0=66 +ofdm5gpo=0x22222222 +ofdm5glpo=0x11111111 +ofdm5ghpo=0x22222222 +mcs5gpo0=0x6666 +mcs5gpo1=0x6666 +mcs5glpo0=0x5555 +mcs5glpo1=0x5555 +mcs5ghpo0=0x6666 +mcs5ghpo1=0x6666 + +cckPwrOffset=4 +cckdigfilttype=22 +ofdmdigfilttype=2 +extpagain5g=2 +#wl0id=0x431b + +# For 2GHz Tx EVM/SM +rfreg033=0x19 +rfreg033_cck=0x1d +pacalidx2g=65 +dacrate2g=160 +txalpfbyp2g=1 +bphyscale=17 + +# 5GHz LOFT and IQ CAL +txgaintbl5g=1 +txiqlopapu5g=1 +txiqlopag5g=0x10 +iqlocalidx5g=24 + +# 5GHz Noise CAL parameter +noise_cal_po_5g=5 +noise_cal_enable_5g=0 + +# 2GHz RxPER at low rates +noise_cal_ref_2g=56 +noise_cal_po_bias_2g=-4 +noise_cal_enable_2g=1 + +# Max input level on a-band +triso5g=9 + +# Tx power control, especially temp. +tssitime=1 + +#fc+1.7GHz Spur Elimination +loidacmode5g=1 + +swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff +swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8 diff --git a/install-brcmfmac.sh b/install-brcmfmac.sh index 50ff37d..5e6c4cc 100644 --- a/install-brcmfmac.sh +++ b/install-brcmfmac.sh @@ -5,6 +5,10 @@ if [[ -e /sys/firmware/devicetree/base/compatible ]]; then *cubietech,cubietruck*) ln -sf brcmfmac43362-sdio-cubietruck.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt ;; + *cubox-i*) + ln -sf brcmfmac4329-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4329-sdio.txt + ln -sf brcmfmac4330-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4330-sdio.txt + ;; *sinovoip,bpi-m2*) ln -sf brcmfmac43362-sdio-bananapi-m2.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt ;; From a4b6e85190b2118d042964a07bbbb493a4a719c9c98e0ec91a05255a0877bb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 8 Jan 2017 11:00:22 +0000 Subject: [PATCH 2/2] Accepting request 449172 from home:a_faerber:branches:hardware Add vendor prefix for CuBox-i compatible string OBS-URL: https://build.opensuse.org/request/show/449172 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=7 --- bcm43xx-firmware.changes | 8 +++++++- install-brcmfmac.sh | 16 ++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 73f5db6..b4ef314 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Sun Jan 8 10:45:42 UTC 2017 - afaerber@suse.de + +- Add vendor prefix for CuBox-i compatible string +- Reorder by board name + ------------------------------------------------------------------- Tue Jan 3 21:08:25 UTC 2017 - tbechtold@suse.com -- Add brcmfmac4329-sdio-cubox-i.txt and brcmfmac4330-sdio-cubox-i.txt . +- Add brcmfmac4329-sdio-cubox-i.txt and brcmfmac4330-sdio-cubox-i.txt. ------------------------------------------------------------------- Tue Oct 18 13:34:43 UTC 2016 - afaerber@suse.de diff --git a/install-brcmfmac.sh b/install-brcmfmac.sh index 5e6c4cc..7944598 100644 --- a/install-brcmfmac.sh +++ b/install-brcmfmac.sh @@ -2,18 +2,18 @@ if [[ -e /sys/firmware/devicetree/base/compatible ]]; then case "$(cat /sys/firmware/devicetree/base/compatible 2>/dev/null)" in - *cubietech,cubietruck*) - ln -sf brcmfmac43362-sdio-cubietruck.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt - ;; - *cubox-i*) - ln -sf brcmfmac4329-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4329-sdio.txt - ln -sf brcmfmac4330-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4330-sdio.txt + *lemaker,bananapro*) + ln -sf brcmfmac43362-sdio-bananapi-m1+.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt ;; *sinovoip,bpi-m2*) ln -sf brcmfmac43362-sdio-bananapi-m2.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt ;; - *lemaker,bananapro*) - ln -sf brcmfmac43362-sdio-bananapi-m1+.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt + *cubietech,cubietruck*) + ln -sf brcmfmac43362-sdio-cubietruck.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt + ;; + *solidrun,cubox-i*) + ln -sf brcmfmac4329-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4329-sdio.txt + ln -sf brcmfmac4330-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4330-sdio.txt ;; *raspberrypi,3-model-b*) ln -sf brcmfmac43430-sdio-raspberrypi3b.txt /lib/firmware/brcm/brcmfmac43430-sdio.txt