From 41c7d06fc56d23fd50d64e79d87a2a4b7bba2184 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Fri, 14 Sep 2018 18:11:58 +0300 Subject: agl_raspberrypi3.inc: WiFi on Raspberry Pi 3 B & B+ Use linux-firmware-raspbian packages for bcm43430 and bcm43455. Bug-AGL: SPEC-1729, SPEC-1652 Change-Id: Ib634ee3351fa91d8d1704656f4a40d1b40cd05e3 Signed-off-by: Leon Anavi (cherry picked from commit 6e7be8f6020c6925430e9c442c2d20bbf4bc9fc2) --- meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 2 +- .../linux-firmware/files/brcmfmac43455-sdio.bin | Bin 600487 -> 0 bytes .../files/brcmfmac43455-sdio.clm_blob | Bin 14036 -> 0 bytes .../linux-firmware/files/brcmfmac43455-sdio.txt | 92 --------------------- .../linux-firmware/linux-firmware_%.bbappend | 26 ------ 5 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.bin delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.clm_blob delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.txt delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend (limited to 'meta-agl-bsp') diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index 1f6a02c89..b570e778f 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -17,7 +17,7 @@ MACHINE_FEATURES += "vc4graphics" # For libomxil #LICENSE_FLAGS_WHITELIST = "commercial" -IMAGE_INSTALL_append = " kernel-modules linux-firmware " +IMAGE_INSTALL_append = " kernel-modules linux-firmware-raspbian-bcm43430 linux-firmware-raspbian-bcm43455 " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.bin b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.bin deleted file mode 100644 index 94f2add70..000000000 Binary files a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.bin and /dev/null differ diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.clm_blob b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.clm_blob deleted file mode 100644 index 3b9b5bdc1..000000000 Binary files a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.clm_blob and /dev/null differ diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.txt b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.txt deleted file mode 100644 index 260c9299c..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/files/brcmfmac43455-sdio.txt +++ /dev/null @@ -1,92 +0,0 @@ -# Cloned from bcm94345wlpagb_p2xx.txt -NVRAMRev=$Rev: 498373 $ -sromrev=11 -vendid=0x14e4 -devid=0x43ab -manfid=0x2d0 -prodid=0x06e4 -#macaddr=00:90:4c:c5:12:38 -macaddr=b8:27:eb:74:f2:6c -nocrc=1 -boardtype=0x6e4 -boardrev=0x1304 - -#XTAL 37.4MHz -xtalfreq=37400 - -btc_mode=1 -#------------------------------------------------------ -#boardflags: 5GHz eTR switch by default -# 2.4GHz eTR switch by default -# bit1 for btcoex -boardflags=0x00480201 -boardflags2=0x40800000 -boardflags3=0x48200100 -phycal_tempdelta=15 -rxchain=1 -txchain=1 -aa2g=1 -aa5g=1 -tssipos5g=1 -tssipos2g=1 -femctrl=0 -AvVmid_c0=1,165,2,100,2,100,2,100,2,100 -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 -itrsw=1 -pdoffsetcckma0=2 -pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0 -pdoffset2g40ma0=16 -pdoffset40ma0=0x8888 -pdoffset80ma0=0x8888 -extpagain5g=2 -extpagain2g=2 -tworangetssi2g=1 -tworangetssi5g=1 -# LTECX flags -# WCI2 -ltecxmux=0 -ltecxpadnum=0x0504 -ltecxfnsel=0x22 -ltecxgcigpio=0x32 - -maxp2ga0=80 -ofdmlrbw202gpo=0x0022 -dot11agofdmhrbw202gpo=0x4442 -mcsbw202gpo=0x98444422 -mcsbw402gpo=0x98444422 -maxp5ga0=82,82,82,82 -mcsbw205glpo=0xb9555000 -mcsbw205gmpo=0xb9555000 -mcsbw205ghpo=0xb9555000 -mcsbw405glpo=0xb9555000 -mcsbw405gmpo=0xb9555000 -mcsbw405ghpo=0xb9555000 -mcsbw805glpo=0xb9555000 -mcsbw805gmpo=0xb9555000 -mcsbw805ghpo=0xb9555000 - -swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff -swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe -swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3 -swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3 - -vcodivmode=1 -deadman_to=481500000 - -ed_thresh2g=-54 -ed_thresh5g=-54 -eu_edthresh2g=-54 -eu_edthresh5g=-54 -ldo1=4 -rawtempsense=0x1ff -cckPwrIdxCorr=3 -cckTssiDelay=150 -ofdmTssiDelay=150 -txpwr2gAdcScale=1 -txpwr5gAdcScale=1 -dot11b_opts=0x3aa85 -cbfilttype=1 -fdsslevel_ch11=6 diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend deleted file mode 100644 index 6042c4197..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/files:" - -SRC_URI_append_rpi = " \ - file://brcmfmac43455-sdio.bin \ - file://brcmfmac43455-sdio.clm_blob \ - file://brcmfmac43455-sdio.txt \ -" - -do_install_append_rpi() { - install -d ${D}${nonarch_base_libdir}/firmware/brcm/ - - # Replace outdated linux-firmware files with updated ones from - # raspbian firmware-nonfree. Raspbian adds blobs and nvram - # definitions that are also necessary so copy those too. - for fw in brcmfmac43455-sdio ; do - install -m 0644 ${WORKDIR}/${fw}.* ${D}${nonarch_base_libdir}/firmware/brcm/ - done -} - -LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx" - -FILES_${PN}-bcm43455 = " \ - ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.* \ -" - -RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" -- cgit 1.2.3-korg