From 68368b70fa58ceacdcdf40405f8f7713d0c44e8f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 May 2018 23:28:54 +0200 Subject: rpi: update firmware, kernel and fixup more stuff --- package/bcm28xx-bootloader/Makefile | 44 +++++----- package/bcm28xx-bootloader/src/boot/bootcode.bin | Bin 52064 -> 52116 bytes package/bcm28xx-bootloader/src/boot/fixup.dat | Bin 6577 -> 6637 bytes package/bcm28xx-bootloader/src/boot/fixup_cd.dat | Bin 2598 -> 2608 bytes package/bcm28xx-bootloader/src/boot/fixup_db.dat | Bin 9737 -> 9799 bytes package/bcm28xx-bootloader/src/boot/fixup_x.dat | Bin 9735 -> 9797 bytes package/bcm28xx-bootloader/src/boot/start.elf | Bin 2826212 -> 2835108 bytes package/bcm28xx-bootloader/src/boot/start_cd.elf | Bin 673668 -> 674884 bytes package/bcm28xx-bootloader/src/boot/start_db.elf | Bin 4969220 -> 4978980 bytes package/bcm28xx-bootloader/src/boot/start_x.elf | Bin 3913252 -> 3921988 bytes package/bcm28xx-vc/Makefile | 2 +- package/brcm-bluetooth/Makefile | 10 +-- package/brcmfmac-firmware/Makefile | 2 +- package/brcmfmac-firmware/src/BCM43430A1.hcd | Bin 0 -> 36264 bytes package/brcmfmac-firmware/src/BCM4345C0.hcd | Bin 0 -> 55096 bytes package/brcmfmac-firmware/src/brcmfmac43236b.bin | Bin 0 -> 348160 bytes .../brcmfmac-firmware/src/brcmfmac43241b5-sdio.bin | Bin 0 -> 408682 bytes package/brcmfmac-firmware/src/brcmfmac43242a.bin | Bin 0 -> 479232 bytes .../brcmfmac-firmware/src/brcmfmac43340-sdio.bin | Bin 0 -> 397378 bytes .../brcmfmac-firmware/src/brcmfmac4339-sdio.bin | Bin 0 -> 493599 bytes .../brcmfmac-firmware/src/brcmfmac43430-sdio.bin | Bin 369576 -> 388739 bytes .../brcmfmac-firmware/src/brcmfmac43430-sdio.txt | 25 ++---- .../brcmfmac-firmware/src/brcmfmac43455-sdio.bin | Bin 0 -> 600487 bytes .../src/brcmfmac43455-sdio.clm_blob | Bin 0 -> 14036 bytes .../brcmfmac-firmware/src/brcmfmac43455-sdio.txt | 92 +++++++++++++++++++++ .../brcmfmac-firmware/src/brcmfmac4350-pcie.bin | Bin 0 -> 626140 bytes .../brcmfmac-firmware/src/brcmfmac4350c2-pcie.bin | Bin 0 -> 623304 bytes .../brcmfmac-firmware/src/brcmfmac4354-sdio.bin | Bin 507752 -> 591837 bytes .../brcmfmac-firmware/src/brcmfmac4356-pcie.bin | Bin 0 -> 623012 bytes package/brcmfmac-firmware/src/brcmfmac43569.bin | Bin 0 -> 557056 bytes .../brcmfmac-firmware/src/brcmfmac43570-pcie.bin | Bin 0 -> 550333 bytes .../src/brcmfmac43602-pcie.ap.bin | Bin 0 -> 595472 bytes .../brcmfmac-firmware/src/brcmfmac43602-pcie.bin | Bin 0 -> 635449 bytes .../brcmfmac-firmware/src/brcmfmac4366b-pcie.bin | Bin 0 -> 989401 bytes .../brcmfmac-firmware/src/brcmfmac4371-pcie.bin | Bin 0 -> 623448 bytes package/busybox/Config.in.manual | 2 + target/config/Config.in.addons | 19 ++++- target/config/Config.in.runtime | 2 - target/linux/Config.in.kernelversion | 4 +- target/linux/config/Config.in.block | 8 ++ target/linux/config/Config.in.bluetooth | 3 +- target/linux/config/Config.in.wireless | 12 ++- 42 files changed, 165 insertions(+), 60 deletions(-) create mode 100644 package/brcmfmac-firmware/src/BCM43430A1.hcd create mode 100644 package/brcmfmac-firmware/src/BCM4345C0.hcd create mode 100644 package/brcmfmac-firmware/src/brcmfmac43236b.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43241b5-sdio.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43242a.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43340-sdio.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac4339-sdio.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43455-sdio.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43455-sdio.clm_blob create mode 100644 package/brcmfmac-firmware/src/brcmfmac43455-sdio.txt create mode 100644 package/brcmfmac-firmware/src/brcmfmac4350-pcie.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac4350c2-pcie.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac4356-pcie.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43569.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43570-pcie.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43602-pcie.ap.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac43602-pcie.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac4366b-pcie.bin create mode 100644 package/brcmfmac-firmware/src/brcmfmac4371-pcie.bin diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 54fc57f18..4ea08bf74 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm28xx-bootloader # not cloned, local src directory used -PKG_VERSION:= 865ddc1393f558198e7e7ce70928ff2e49c4f7f6 +PKG_VERSION:= 784fe6cebd9e5726c0c7b9e449f7cdbf2cf6959d PKG_RELEASE:= 1 PKG_DESCR:= bootloader for bcm28xx PKG_SECTION:= base/boot @@ -59,55 +59,59 @@ endif printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),) - printf "dtoverlay=hifiberry-amp.dtb\n" >> \ + printf "dtoverlay=hifiberry-amp\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_DAC),) - printf "dtoverlay=hifiberry-dac.dtb\n" >> \ + printf "dtoverlay=hifiberry-dac\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_DACPLUS),) - printf "dtoverlay=hifiberry-dacplus.dtb\n" >> \ + printf "dtoverlay=hifiberry-dacplus\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_DIGI),) - printf "dtoverlay=hifiberry-digi.dtb\n" >> \ + printf "dtoverlay=hifiberry-digi\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_RPI_DAC),) - printf "dtoverlay=rpi-dac.dtb\n" >> \ + printf "dtoverlay=rpi-dac\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_IQAUDIO_DAC),) - printf "dtoverlay=iqaudio-dac.dtb\n" >> \ + printf "dtoverlay=iqaudio-dac\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_RPI_PROTO),) - printf "dtoverlay=rpi-proto.dtb\n" >> \ + printf "dtoverlay=rpi-proto\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifeq ($(ADK_TARGET_HARDWARE_RPI3_NO_WIFI),y) + printf "dtoverlay=pi3-disable-wifi\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifeq ($(ADK_TARGET_HARDWARE_RPI3_NO_BT),y) + printf "dtoverlay=pi3-disable-bt\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifeq ($(ADK_TARGET_HARDWARE_RPI3_SERIAL),y) - printf "dtoverlay=pi3-disable-bt.dtb\n" >> \ + printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) printf "arm_control=0x200\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64),y) - printf "arm_control=0x200\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt - printf "enable_uart=1\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -endif - printf "# License keys for video decoding\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +ifneq ($(ADK_RUNTIME_MPEG2_KEY),) printf "decode_MPG2=$(ADK_RUNTIME_MPEG2_KEY)\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifneq ($(ADK_RUNTIME_VC1_KEY),) printf "decode_WVC1=$(ADK_RUNTIME_VC1_KEY)\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y) $(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/usr/bin $(INSTALL_BIN) ./files/vcdbg \ diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin index 75a84dbf5..1a8f6402a 100644 Binary files a/package/bcm28xx-bootloader/src/boot/bootcode.bin and b/package/bcm28xx-bootloader/src/boot/bootcode.bin differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup.dat b/package/bcm28xx-bootloader/src/boot/fixup.dat index 0a0e52dc3..79e9aa171 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup.dat and b/package/bcm28xx-bootloader/src/boot/fixup.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat index 1c379bebd..79b53400c 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat and b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup_db.dat b/package/bcm28xx-bootloader/src/boot/fixup_db.dat index f54329e10..210ccb81d 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup_db.dat and b/package/bcm28xx-bootloader/src/boot/fixup_db.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup_x.dat b/package/bcm28xx-bootloader/src/boot/fixup_x.dat index 2baa1de59..1f52982a6 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup_x.dat and b/package/bcm28xx-bootloader/src/boot/fixup_x.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/start.elf b/package/bcm28xx-bootloader/src/boot/start.elf index 874c66053..030be853e 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start.elf and b/package/bcm28xx-bootloader/src/boot/start.elf differ diff --git a/package/bcm28xx-bootloader/src/boot/start_cd.elf b/package/bcm28xx-bootloader/src/boot/start_cd.elf index c600e70c5..43e40673f 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start_cd.elf and b/package/bcm28xx-bootloader/src/boot/start_cd.elf differ diff --git a/package/bcm28xx-bootloader/src/boot/start_db.elf b/package/bcm28xx-bootloader/src/boot/start_db.elf index 93a06b76a..3db397d43 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start_db.elf and b/package/bcm28xx-bootloader/src/boot/start_db.elf differ diff --git a/package/bcm28xx-bootloader/src/boot/start_x.elf b/package/bcm28xx-bootloader/src/boot/start_x.elf index c8ec97f1a..21d7bbfae 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start_x.elf and b/package/bcm28xx-bootloader/src/boot/start_x.elf differ diff --git a/package/bcm28xx-vc/Makefile b/package/bcm28xx-vc/Makefile index b23e86f64..c7337c859 100644 --- a/package/bcm28xx-vc/Makefile +++ b/package/bcm28xx-vc/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= videocore tools and libraries PKG_SECTION:= libs/video PKG_BUILDDEP:= cmake-host -PKG_NEEDS:= threads +PKG_NEEDS:= c++ threads PKG_URL:= https://github.com/raspberrypi/userland PKG_SITES:= https://github.com/raspberrypi/userland.git diff --git a/package/brcm-bluetooth/Makefile b/package/brcm-bluetooth/Makefile index 083594749..ae455818c 100644 --- a/package/brcm-bluetooth/Makefile +++ b/package/brcm-bluetooth/Makefile @@ -28,7 +28,7 @@ do-install: ${INSTALL_DIR} ${IDIR_BRCM_BLUETOOTH}/etc/init.d $(INSTALL_BIN) ./files/hci $(IDIR_BRCM_BLUETOOTH)/etc/init.d/ ${INSTALL_DIR} ${IDIR_BRCM_BLUETOOTH}/lib/firmware/brcm -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3)$(ADK_TARGET_SYSTEM_RASPBERRY_PI3P),y) ${CP} ${WRKBUILD}/BCM43430A1.hcd ${IDIR_BRCM_BLUETOOTH}/lib/firmware else ${CP} ${WRKBUILD}/*.hcd ${IDIR_BRCM_BLUETOOTH}/lib/firmware/brcm @@ -36,13 +36,5 @@ else ${INSTALL_BIN} ${WRKBUILD}/brcm_patchram \ ${IDIR_BRCM_BLUETOOTH}/sbin/brcm_patchram endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P),y) - ${CP} ${WRKBUILD}/BCM43430A1.hcd ${IDIR_BRCM_BLUETOOTH}/lib/firmware -else - ${CP} ${WRKBUILD}/*.hcd ${IDIR_BRCM_BLUETOOTH}/lib/firmware/brcm - ${INSTALL_DIR} ${IDIR_BRCM_BLUETOOTH}/sbin - ${INSTALL_BIN} ${WRKBUILD}/brcm_patchram \ - ${IDIR_BRCM_BLUETOOTH}/sbin/brcm_patchram -endif include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/brcmfmac-firmware/Makefile b/package/brcmfmac-firmware/Makefile index aa0738eb2..4fd65ab52 100644 --- a/package/brcmfmac-firmware/Makefile +++ b/package/brcmfmac-firmware/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= brcmfmac-firmware PKG_VERSION:= 1.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_DESCR:= firmware for broadcom wireless cards PKG_SECTION:= sys/firmware diff --git a/package/brcmfmac-firmware/src/BCM43430A1.hcd b/package/brcmfmac-firmware/src/BCM43430A1.hcd new file mode 100644 index 000000000..9b087f1b6 Binary files /dev/null and b/package/brcmfmac-firmware/src/BCM43430A1.hcd differ diff --git a/package/brcmfmac-firmware/src/BCM4345C0.hcd b/package/brcmfmac-firmware/src/BCM4345C0.hcd new file mode 100644 index 000000000..6870153de Binary files /dev/null and b/package/brcmfmac-firmware/src/BCM4345C0.hcd differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43236b.bin b/package/brcmfmac-firmware/src/brcmfmac43236b.bin new file mode 100644 index 000000000..8a2004a91 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43236b.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43241b5-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43241b5-sdio.bin new file mode 100644 index 000000000..8d70d17cf Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43241b5-sdio.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43242a.bin b/package/brcmfmac-firmware/src/brcmfmac43242a.bin new file mode 100644 index 000000000..80604d853 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43242a.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43340-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43340-sdio.bin new file mode 100644 index 000000000..368b0a150 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43340-sdio.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac4339-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac4339-sdio.bin new file mode 100644 index 000000000..8d1b3819a Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac4339-sdio.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43430-sdio.bin index 2f9647263..4b2945eac 100644 Binary files a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.bin and b/package/brcmfmac-firmware/src/brcmfmac43430-sdio.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.txt b/package/brcmfmac-firmware/src/brcmfmac43430-sdio.txt index ea4f648a1..3d917a7fd 100644 --- a/package/brcmfmac-firmware/src/brcmfmac43430-sdio.txt +++ b/package/brcmfmac-firmware/src/brcmfmac43430-sdio.txt @@ -1,19 +1,20 @@ -# NVRAM file for BCM943430WLPTH +# 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=0x0727 +prodid=0x0726 vendid=0x14e4 devid=0x43e2 -boardtype=0x0727 -boardrev=0x1101 +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 @@ -21,6 +22,7 @@ ccode=ALL pa0itssit=0x20 extpagain2g=0 + #PA parameters for 2.4GHz, measured at CHIP OUTPUT pa2ga0=-168,7161,-820 AvVmid_c0=0x0,0xc8 @@ -40,15 +42,9 @@ ofdmdigfilttypebe=18 # PAPD mode: papdmode=1 papdvalidtest=1 -pacalidx2g=42 -papdepsoffset=-22 -papdendidx=58 - -# LTECX flags -ltecxmux=0 -ltecxpadnum=0x0102 -ltecxfnsel=0x44 -ltecxgcigpio=0x01 +pacalidx2g=32 +papdepsoffset=-36 +papdendidx=61 il0macaddr=00:90:4c:c5:12:38 wl0id=0x431b @@ -61,6 +57,3 @@ muxenab=0x1 #VCO freq 326.4MHz spurconfig=0x3 - -edonthd20l=-75 -edoffthd20ul=-80 diff --git a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.bin new file mode 100644 index 000000000..94f2add70 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.clm_blob b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.clm_blob new file mode 100644 index 000000000..3b9b5bdc1 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.clm_blob differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43455-sdio.txt b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.txt new file mode 100644 index 000000000..260c9299c --- /dev/null +++ b/package/brcmfmac-firmware/src/brcmfmac43455-sdio.txt @@ -0,0 +1,92 @@ +# 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/package/brcmfmac-firmware/src/brcmfmac4350-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac4350-pcie.bin new file mode 100644 index 000000000..303125197 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac4350-pcie.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac4350c2-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac4350c2-pcie.bin new file mode 100644 index 000000000..256ded123 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac4350c2-pcie.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac4354-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac4354-sdio.bin index 9e9658516..48afad606 100644 Binary files a/package/brcmfmac-firmware/src/brcmfmac4354-sdio.bin and b/package/brcmfmac-firmware/src/brcmfmac4354-sdio.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac4356-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac4356-pcie.bin new file mode 100644 index 000000000..9ed885214 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac4356-pcie.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43569.bin b/package/brcmfmac-firmware/src/brcmfmac43569.bin new file mode 100644 index 000000000..8323536a7 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43569.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43570-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac43570-pcie.bin new file mode 100644 index 000000000..c0c82d005 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43570-pcie.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43602-pcie.ap.bin b/package/brcmfmac-firmware/src/brcmfmac43602-pcie.ap.bin new file mode 100644 index 000000000..b4a589d5a Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43602-pcie.ap.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac43602-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac43602-pcie.bin new file mode 100644 index 000000000..488b4c04a Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac43602-pcie.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac4366b-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac4366b-pcie.bin new file mode 100644 index 000000000..6fc932ed9 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac4366b-pcie.bin differ diff --git a/package/brcmfmac-firmware/src/brcmfmac4371-pcie.bin b/package/brcmfmac-firmware/src/brcmfmac4371-pcie.bin new file mode 100644 index 000000000..8b3a51b91 Binary files /dev/null and b/package/brcmfmac-firmware/src/brcmfmac4371-pcie.bin differ diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index a6437d0e8..60b0f93f8 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -66,6 +66,7 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT select BUSYBOX_RDATE if !BUSYBOX_DISABLE_RDATE select BUSYBOX_READLINK select BUSYBOX_RESET + select BUSYBOX_RFKILL if !BUSYBOX_DISABLE_RFKILL select BUSYBOX_RM select BUSYBOX_RMDIR select BUSYBOX_RUN_PARTS @@ -85,6 +86,7 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT select BUSYBOX_TEST select BUSYBOX_TIME select BUSYBOX_TOUCH + select BUSYBOX_TOP select BUSYBOX_TR select BUSYBOX_TRUE select BUSYBOX_UNAME diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons index 241ff1b20..f26804e4a 100644 --- a/target/config/Config.in.addons +++ b/target/config/Config.in.addons @@ -46,20 +46,33 @@ depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \ || ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 ) config ADK_TARGET_HARDWARE_RPI3_SERIAL - bool "enable serial" + bool "serial" + select ADK_TARGET_HARDWARE_RPI3_NO_BT select ADK_LINUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_LINUX select ADK_WALDUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_RPI3_BT - bool "enable bluetooth" + bool "bluetooth" select ADK_LINUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_LINUX select ADK_WALDUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_RPI3_NONE - bool "disable serial and bluetooth" + bool "none" endchoice +config ADK_TARGET_HARDWARE_RPI3_NO_BT + bool + +config ADK_TARGET_HARDWARE_RPI3_NO_WIFI + bool "Disable wifi" + depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \ + && ( ADK_TARGET_SYSTEM_RASPBERRY_PI3 \ + || ADK_TARGET_SYSTEM_RASPBERRY_PI3P \ + || ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 \ + || ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 ) + + choice prompt "Audio Board Addon" depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && ADK_TARGET_BOARD_BCM28XX diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 5403df361..974a2e3f2 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -723,13 +723,11 @@ depends on ADK_TARGET_BOARD_BCM28XX config ADK_RUNTIME_MPEG2_KEY string "MPEG2" - default "0x12345678" help Hardware-specific license key for MPEG2 decoding. config ADK_RUNTIME_VC1_KEY string "VC-1" - default "0x12345678" help Hardware-specific license key for VC-1 decoding. diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 103485cc0..3a4b09f6d 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -205,7 +205,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT default "6064a9bdf48cefbccc4f6472dd04251f0dec1931" if ADK_TARGET_ARCH_CSKY default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 - default "865ddc1393f558198e7e7ce70928ff2e49c4f7f6" if ADK_TARGET_BOARD_BCM28XX + default "a2092141807514666a273971cc8fa9e80f14439f" if ADK_TARGET_BOARD_BCM28XX default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG @@ -221,7 +221,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT_VER default "4.9.56" if ADK_TARGET_ARCH_CSKY default "4.15.0" if ADK_TARGET_ARCH_RISCV32 default "4.15.0" if ADK_TARGET_ARCH_RISCV64 - default "4.14.39" if ADK_TARGET_BOARD_BCM28XX + default "4.14.43" if ADK_TARGET_BOARD_BCM28XX default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70 diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 23b601f49..4cdc2ba22 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -126,6 +126,9 @@ config ADK_LINUX_KERNEL_CONNECTOR config ADK_LINUX_KERNEL_MMC bool +config ADK_LINUX_KERNEL_MMC_SPI + bool + config ADK_LINUX_KERNEL_MMC_BLOCK bool @@ -144,6 +147,9 @@ config ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS config ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM bool +config ADK_LINUX_KERNEL_MMC_BCM2835_MMC + bool + config ADK_LINUX_KERNEL_MMC_BCM2835_DMA bool @@ -453,6 +459,7 @@ config ADK_LINUX_KERNEL_MMC_BCM2835 select ADK_LINUX_KERNEL_LBDAF select ADK_LINUX_KERNEL_SCSI select ADK_LINUX_KERNEL_MMC + select ADK_LINUX_KERNEL_MMC_SPI select ADK_LINUX_KERNEL_MMC_BLOCK select ADK_LINUX_KERNEL_MMC_BLOCK_BOUNCE select ADK_LINUX_KERNEL_BLK_DEV @@ -463,6 +470,7 @@ config ADK_LINUX_KERNEL_MMC_BCM2835 select ADK_LINUX_KERNEL_MMC_SDHCI select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM select ADK_LINUX_KERNEL_MMC_BCM2835_DMA + select ADK_LINUX_KERNEL_MMC_BCM2835_MMC select ADK_LINUX_KERNEL_MMC_BCM2835_SDHOST depends on ADK_TARGET_BOARD_BCM28XX default y if ADK_TARGET_BOARD_BCM28XX diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index dff5c09f1..49f0a1202 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -137,8 +137,7 @@ config ADK_LINUX_KERNEL_BT_HCIUART_BCM select ADK_LINUX_KERNEL_BT_HCIUART select ADK_LINUX_KERNEL_BT_HCIUART_3WIRE select ADK_LINUX_KERNEL_BT_BCM - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3 - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3P + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3 || ADK_TARGET_SYSTEM_RASPBERRY_PI3P default n help The Broadcom protocol support enables Bluetooth HCI over serial diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless index 4623f6ef2..ecc855b50 100644 --- a/target/linux/config/Config.in.wireless +++ b/target/linux/config/Config.in.wireless @@ -133,6 +133,9 @@ depends on ADK_TARGET_WITH_CARDBUS \ || ADK_TARGET_WITH_SDIO \ || ADK_TARGET_GENERIC +config ADK_LINUX_KERNEL_BRCMDBG + bool + config ADK_LINUX_KERNEL_BRCMFMAC tristate "Broadcom brcmfmac wireless driver" select ADK_LINUX_KERNEL_WIRELESS @@ -141,24 +144,25 @@ config ADK_LINUX_KERNEL_BRCMFMAC select ADK_LINUX_KERNEL_BCMA_POSSIBLE select ADK_LINUX_KERNEL_RFKILL select ADK_LINUX_KERNEL_WLAN_VENDOR_BROADCOM + select ADK_LINUX_KERNEL_BRCMDBG select ADK_PACKAGE_BRCMFMAC_FIRMWARE config ADK_LINUX_KERNEL_BRCMFMAC_SDIO bool "Broadcom brcmfmac wireless driver (SDIO)" - select ADK_LINUX_KERNEL_BRCMFMAC m + select ADK_LINUX_KERNEL_BRCMFMAC depends on ADK_TARGET_WITH_SDIO default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI0 + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3 + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P default n help Driver for Broadcom FullMac wireless cards (SDIO). config ADK_LINUX_KERNEL_BRCMFMAC_USB bool "Broadcom brcmfmac wireless driver (USB)" - select ADK_LINUX_KERNEL_BRCMFMAC m + select ADK_LINUX_KERNEL_BRCMFMAC depends on ADK_TARGET_WITH_USB - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P default n help Driver for Broadcom FullMac wireless cards (USB). -- cgit v1.2.3