diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index ad5ac27edd8..b824220ae9a 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="91e955e3786a807f4af8ae7e4a4bbf9ec470b843" -PKG_SHA256="97fb09cc0dcf2597ea7f7a47037ec8b84346faf62949abae7bea19693f30fbd0" +PKG_VERSION="afd824ac32ab1f3bf8b462178770253f8757bf1f" +PKG_SHA256="89370e2d0f5338f1e08140e41e74f4326130069068850604bf72622aebb4394c" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/udev.d/81-bt-power.rules b/packages/linux-firmware/brcmfmac_sdio-firmware/udev.d/81-bt-power.rules deleted file mode 100644 index 39a1bb60c65..00000000000 --- a/packages/linux-firmware/brcmfmac_sdio-firmware/udev.d/81-bt-power.rules +++ /dev/null @@ -1,5 +0,0 @@ -################################################################################ -# udev rule to set bluetooth power up -################################################################################ - -ACTION=="add", KERNEL=="hci0", RUN+="/usr/bin/hciconfig hci0 up" diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index ef6e20ad753..407a686b543 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -43,9 +43,13 @@ makeinstall_target() { done < ${fwlist} done - # The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead - rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.bin - rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.bin + # The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead. + # They are also not required at all if the kernel is not suitably configured. + if listcontains "${FIRMWARE}" "brcmfmac_sdio-firmware-rpi" || \ + ! grep -q "^CONFIG_BRCMFMAC_SDIO=y" $(kernel_config_path); then + rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.* + rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.* + fi # Cleanup - which may be project or device specific find_file_path scripts/cleanup.sh && ${FOUND_PATH} ${FW_TARGET_DIR} || true diff --git a/packages/linux-firmware/kernel-firmware/patches/kernel-firmware-02-add-brcmfmac-43xxx-configs.patch b/packages/linux-firmware/kernel-firmware/patches/kernel-firmware-02-add-brcmfmac-43xxx-configs.patch new file mode 100644 index 00000000000..493745205d0 --- /dev/null +++ b/packages/linux-firmware/kernel-firmware/patches/kernel-firmware-02-add-brcmfmac-43xxx-configs.patch @@ -0,0 +1,188 @@ +From 1e6e0b28cd5b3e621e012169563d45748734b721 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Thu, 29 Nov 2018 23:47:02 +0000 +Subject: [PATCH] add missing brcmfmac434[30,55]-sdio.txt config files + +--- + brcm/brcmfmac43430-sdio.txt | 64 ++++++++++++++++++++++++++++++ + brcm/brcmfmac43455-sdio.txt | 97 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 161 insertions(+) + create mode 100644 brcm/brcmfmac43430-sdio.txt + create mode 100644 brcm/brcmfmac43455-sdio.txt + +diff --git a/brcm/brcmfmac43430-sdio.txt b/brcm/brcmfmac43430-sdio.txt +new file mode 100644 +index 0000000..e644e6a +--- /dev/null ++++ b/brcm/brcmfmac43430-sdio.txt +@@ -0,0 +1,64 @@ ++# NVRAM file for BCM943430WLSELG ++# 2.4 GHz, 20 MHz BW mode ++ ++# The following parameter values are just placeholders, need to be updated. ++manfid=0x2d0 ++prodid=0x0726 ++vendid=0x14e4 ++devid=0x43e2 ++boardtype=0x0726 ++boardrev=0x1202 ++boardnum=22 ++macaddr=00:90:4c:c5:12:38 ++sromrev=11 ++boardflags=0x00404201 ++boardflags3=0x08000000 ++xtalfreq=37400 ++#xtalfreq=19200 ++nocrc=1 ++ag0=255 ++aa2g=1 ++ccode=ALL ++ ++pa0itssit=0x20 ++extpagain2g=0 ++ ++#PA parameters for 2.4GHz, measured at CHIP OUTPUT ++pa2ga0=-168,7161,-820 ++AvVmid_c0=0x0,0xc8 ++cckpwroffset0=5 ++ ++# PPR params ++maxp2ga0=84 ++txpwrbckof=6 ++cckbw202gpo=0 ++legofdmbw202gpo=0x66111111 ++mcsbw202gpo=0x77711111 ++propbw202gpo=0xdd ++ ++# OFDM IIR : ++ofdmdigfilttype=18 ++ofdmdigfilttypebe=18 ++# PAPD mode: ++papdmode=1 ++papdvalidtest=1 ++pacalidx2g=32 ++papdepsoffset=-36 ++papdendidx=61 ++ ++il0macaddr=00:90:4c:c5:12:38 ++wl0id=0x431b ++ ++deadman_to=0xffffffff ++# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG ++muxenab=0x1 ++# CLDO PWM voltage settings - 0x4 - 1.1 volt ++#cldo_pwm=0x4 ++ ++#VCO freq 326.4MHz ++spurconfig=0x3 ++ ++# Experimental Bluetooth coexistence parameters from Cypress ++btc_mode=1 ++btc_params8=0x4e20 ++btc_params1=0x7530 +diff --git a/brcm/brcmfmac43455-sdio.txt b/brcm/brcmfmac43455-sdio.txt +new file mode 100644 +index 0000000..04b6570 +--- /dev/null ++++ b/brcm/brcmfmac43455-sdio.txt +@@ -0,0 +1,97 @@ ++# 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 ++ ++# Experimental Bluetooth coexistence parameters from Cypress ++btc_mode=1 ++btc_params8=0x4e20 ++btc_params1=0x7530 +-- +2.14.1 + diff --git a/packages/linux/package.mk b/packages/linux/package.mk index b17be702c29..8e17c59b023 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,14 +38,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="44e14b21ac57b47246b903b73fa9b9f2d78ff81e" # 4.19.4 - PKG_SHA256="4cd3aa5167470dacfe1f6e0bcbf09f4461bcb8db1db06b3405c8fcfc0678218a" + PKG_VERSION="7958c6b7107c96939530f731c58e6099183af525" # 4.19.8 + PKG_SHA256="3c1c014007ba215b764411813d1d6409e09566c606b915d9137b5d2432c14665" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="4.19.4" - PKG_SHA256="a38f5606bba1f5611c798541f6c3d43267b8599d9e3167471d4b662e33ff47aa" + PKG_VERSION="4.19.8" + PKG_SHA256="d540d066f307f13f0cfe7e097373cd1af2cc4866b5e36a503775b4e69167e171" PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index ba22c222e3d..93745cf0726 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="91e955e3786a807f4af8ae7e4a4bbf9ec470b843" -PKG_SHA256="35d7e5b485b248fa9e2ff627bd7ccb0cb12089297cb544d2bfd35e4b691abc01" +PKG_VERSION="afd824ac32ab1f3bf8b462178770253f8757bf1f" +PKG_SHA256="807593daf491ad5ddf2f96e02440394a951a9ad78dec87cafd34c039e20871cb" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 1e65e033472..391f5f89e9d 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -2054,7 +2054,7 @@ CONFIG_BRCMUTIL=m CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_PROTO_BCDC=y CONFIG_BRCMFMAC_PROTO_MSGBUF=y -# CONFIG_BRCMFMAC_SDIO is not set +CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_USB=y CONFIG_BRCMFMAC_PCIE=y # CONFIG_BRCM_TRACING is not set diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 8573cb15b6e..27a67e26ef0 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.2 Kernel Configuration +# Linux/arm 4.19.7 Kernel Configuration # # @@ -3116,6 +3116,7 @@ CONFIG_SND_SOC_COMPRESS=y # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_ATMEL_SOC is not set CONFIG_SND_BCM2835_SOC_I2S=m +CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m @@ -3892,6 +3893,9 @@ CONFIG_BCM_VIDEOCORE=y CONFIG_BCM2835_VCHIQ=y CONFIG_SND_BCM2835=m # CONFIG_VIDEO_BCM2835 is not set +# CONFIG_BCM2835_VCHIQ_MMAL is not set +# CONFIG_BCM_VC_SM_CMA is not set +# CONFIG_VIDEO_CODEC_BCM2835 is not set # CONFIG_PI433 is not set # CONFIG_MTK_MMC is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 33d8b8119fd..2b19bd58828 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.2 Kernel Configuration +# Linux/arm 4.19.7 Kernel Configuration # # @@ -3231,6 +3231,7 @@ CONFIG_SND_SOC_COMPRESS=y # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_ATMEL_SOC is not set CONFIG_SND_BCM2835_SOC_I2S=m +CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m @@ -4008,6 +4009,9 @@ CONFIG_BCM_VIDEOCORE=y CONFIG_BCM2835_VCHIQ=y CONFIG_SND_BCM2835=m # CONFIG_VIDEO_BCM2835 is not set +# CONFIG_BCM2835_VCHIQ_MMAL is not set +# CONFIG_BCM_VC_SM_CMA is not set +# CONFIG_VIDEO_CODEC_BCM2835 is not set # CONFIG_PI433 is not set # CONFIG_MTK_MMC is not set