From 037ef13a161c6167b328aaf6ca0e259a5b7db037 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 14 Jun 2018 17:21:19 +0200 Subject: [PATCH] brcm2708: move wifi calibration EEPROMs out of base-files Ship EEPROM blobs for specific supported board only and don't have them lurking around in our source tree but rather download them from @github/RPi-Distro/firmware-nonfree upstream. Signed-off-by: Daniel Golle --- package/firmware/brcmfmac-board-rpi/Makefile | 88 +++++++++++++++++ target/linux/brcm2708/Makefile | 3 +- .../lib/firmware/brcm/brcmfmac43430-sdio.txt | 66 ------------- .../firmware/brcm/brcmfmac43455-sdio.clm_blob | Bin 14036 -> 0 bytes .../lib/firmware/brcm/brcmfmac43455-sdio.txt | 92 ------------------ target/linux/brcm2708/image/Makefile | 2 + 6 files changed, 91 insertions(+), 160 deletions(-) create mode 100644 package/firmware/brcmfmac-board-rpi/Makefile delete mode 100644 target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43430-sdio.txt delete mode 100644 target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob delete mode 100644 target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43455-sdio.txt diff --git a/package/firmware/brcmfmac-board-rpi/Makefile b/package/firmware/brcmfmac-board-rpi/Makefile new file mode 100644 index 0000000000..4268d9124c --- /dev/null +++ b/package/firmware/brcmfmac-board-rpi/Makefile @@ -0,0 +1,88 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=brcmfmac-board-rpi +PKG_VERSION:=2018-03-12 +PKG_RELEASE:=86e88fbf0345da49555d0ec34c80b4fbae7d0cd3 +PKG_FLAGS:=nonshared + +include $(INCLUDE_DIR)/package.mk + +BRCMFMAC434XX_SDIO_URL:=@GITHUB/RPi-Distro/firmware-nonfree/$(PKG_RELEASE)/brcm/ +BRCMFMAC43430_SDIO_FILE:=brcmfmac43430-sdio-$(PKG_RELEASE) +BRCMFMAC43455_SDIO_FILE:=brcmfmac43455-sdio-$(PKG_RELEASE) + +define Download/brcmfmac43430_sdio_txt + FILE:=$(BRCMFMAC43430_SDIO_FILE).txt + URL:=$(BRCMFMAC434XX_SDIO_URL) + URL_FILE:=brcmfmac43430-sdio.txt + HASH:=e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0 +endef +$(eval $(call Download,brcmfmac43430_sdio_txt)) + +define Download/brcmfmac43455_sdio_txt + FILE:=$(BRCMFMAC43455_SDIO_FILE).txt + URL:=$(BRCMFMAC434XX_SDIO_URL) + URL_FILE:=brcmfmac43455-sdio.txt + HASH:=15698c62457bcf25e60d063e6c666d6e1b7dacdf2b03e6d14ebbc619de6da6b7 +endef +$(eval $(call Download,brcmfmac43455_sdio_txt)) + +define Download/brcmfmac43455_sdio_clm_blob + FILE:=$(BRCMFMAC43455_SDIO_FILE).clm_blob + URL:=$(BRCMFMAC434XX_SDIO_URL) + URL_FILE:=brcmfmac43455-sdio.clm_blob + HASH:=8e2250518bc789e53109728c3c0a6124bc3801a75a1cb4966125753cf1f0252e +endef +$(eval $(call Download,brcmfmac43455_sdio_clm_blob)) + +define Package/brcmfmac-board-rpi/Default + SECTION:=firmware + CATEGORY:=Firmware + URL:=https://github.com/RPi-Distro/firmware-nonfree/ + DEPENDS:=@TARGET_brcm2708 + PKGARCH:=all +endef + +define Package/brcmfmac-board-rpi2 + $(call Package/brcmfmac-board-rpi/Default) + TITLE:=BCM43430 RPi SDIO NVRAM +endef + +define Package/brcmfmac-board-rpi2/description + NVRAM for the Broadcom BCM43430 on RPi boards. +endef + +define Package/brcmfmac-board-rpi3 + $(call Package/brcmfmac-board-rpi/Default) + TITLE:=BCM43455 RPi SDIO NVRAM +endef + +define Package/brcmfmac-board-rpi3/description + NVRAM and localisations blob for the Broadcom BCM43455 on RPi boards. +endef + +define Build/Prepare + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + cp $(DL_DIR)/$(BRCMFMAC43430_SDIO_FILE).txt $(PKG_BUILD_DIR)/brcmfmac43430-sdio.txt + cp $(DL_DIR)/$(BRCMFMAC43455_SDIO_FILE).txt $(PKG_BUILD_DIR)/brcmfmac43455-sdio.txt + cp $(DL_DIR)/$(BRCMFMAC43455_SDIO_FILE).clm_blob $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob +endef + +define Build/Compile + true +endef + +define Package/brcmfmac-board-rpi2/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43430-sdio.txt $(1)/lib/firmware/brcm/ +endef + +define Package/brcmfmac-board-rpi3/install + $(INSTALL_DIR) $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43455-sdio.txt $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43455-sdio.clm_blob $(1)/lib/firmware/brcm/ +endef + +$(eval $(call BuildPackage,brcmfmac-board-rpi2)) +$(eval $(call BuildPackage,brcmfmac-board-rpi3)) diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index 8f3107bf1a..3032b9ffd1 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -27,8 +27,7 @@ DEFAULT_PACKAGES += \ kmod-usb-hid \ kmod-sound-core kmod-sound-arm-bcm2835 \ kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ - brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio \ - kmod-brcmfmac wpad-mini partx-utils mkf2fs e2fsprogs + partx-utils mkf2fs e2fsprogs KERNELNAME:=Image dtbs diff --git a/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43430-sdio.txt b/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43430-sdio.txt deleted file mode 100644 index ea4f648a18..0000000000 --- a/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43430-sdio.txt +++ /dev/null @@ -1,66 +0,0 @@ -# NVRAM file for BCM943430WLPTH -# 2.4 GHz, 20 MHz BW mode - -# The following parameter values are just placeholders, need to be updated. -manfid=0x2d0 -prodid=0x0727 -vendid=0x14e4 -devid=0x43e2 -boardtype=0x0727 -boardrev=0x1101 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -sromrev=11 -boardflags=0x00404201 -boardflags3=0x08000000 -xtalfreq=37400 -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=42 -papdepsoffset=-22 -papdendidx=58 - -# LTECX flags -ltecxmux=0 -ltecxpadnum=0x0102 -ltecxfnsel=0x44 -ltecxgcigpio=0x01 - -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 - -edonthd20l=-75 -edoffthd20ul=-80 diff --git a/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob b/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob deleted file mode 100644 index 3b9b5bdc15cd0a58a000441c3903539e0e3de080..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14036 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

( 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 m7QcS@@Zo0(74i*{{C-`s-id=U3Pxr~d;c@