From 037ef13a161c6167b328aaf6ca0e259a5b7db037 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
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 <daniel@makrotopia.org>
---
 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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

diff --git a/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43455-sdio.txt b/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43455-sdio.txt
deleted file mode 100644
index 260c9299ca..0000000000
--- a/target/linux/brcm2708/base-files/lib/firmware/brcm/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/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index 326ef5a0ee..69c1d83fbf 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -66,6 +66,7 @@ define Device/rpi-2
   DEVICE_TITLE := Raspberry Pi 2B/3B/3B+/3CM
   DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3
   SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm raspberrypi,2-model-b raspberrypi,3-model-b raspberrypi,3-model-b-plus raspberrypi,compute-module-3
+  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio brcmfmac-board-rpi2 brcmfmac-board-rpi3 kmod-brcmfmac wpad-mini
 endef
 ifeq ($(SUBTARGET),bcm2709)
   TARGET_DEVICES += rpi-2
@@ -76,6 +77,7 @@ define Device/rpi-3
   DEVICE_TITLE := Raspberry Pi 3B/3B+
   DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus
   SUPPORTED_DEVICES := rpi-3-b rpi-3-b-plus raspberrypi,3-model-b raspberrypi,3-model-b-plus
+  DEVICE_PACKAGES := brcmfmac-firmware-43455-sdio brcmfmac-board-rpi3 kmod-brcmfmac wpad-mini
 endef
 ifeq ($(SUBTARGET),bcm2710)
   TARGET_DEVICES += rpi-3
-- 
2.30.2