From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Fri, 16 Sep 2016 09:48:22 +0000 (+0200)
Subject: brcmfmac43430-firmware: remove package and switch to linux-firmware
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c3d3111831d49d1ab37d90bbe6a61f1b2263721d;p=openwrt%2Fstaging%2Fneocturne.git

brcmfmac43430-firmware: remove package and switch to linux-firmware

Now that the firmware for BCM43430 has been submitted to linux-firmware use it
and remove RPiDistro package.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/package/firmware/brcmfmac43430-firmware/Makefile b/package/firmware/brcmfmac43430-firmware/Makefile
deleted file mode 100644
index 7a6bcc0466..0000000000
--- a/package/firmware/brcmfmac43430-firmware/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright (C) 2016 OpenWrt.org
-# Copyright (C) 2016 LEDE project
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=brcmfmac-firmware-43430-sdio
-PKG_VERSION:=2016-06-07
-PKG_RELEASE:=a7491de4c4b2f1ceb5d0dfa5350b95e5c6fb9bd4
-
-include $(INCLUDE_DIR)/package.mk
-
-BRCMFMAC43430_SDIO_URL:=@GITHUB/RPi-Distro/firmware-nonfree/$(PKG_RELEASE)/brcm80211/brcm/
-BRCMFMAC43430_SDIO_FILE:=brcmfmac43430-sdio-$(PKG_RELEASE)
-
-define Download/brcmfmac43430_sdio_bin
-  FILE:=$(BRCMFMAC43430_SDIO_FILE).bin
-  URL:=$(BRCMFMAC43430_SDIO_URL)
-  URL_FILE:=brcmfmac43430-sdio.bin
-  MD5SUM:=b24aad300e161782072b227abe9862f7
-endef
-$(eval $(call Download,brcmfmac43430_sdio_bin))
-
-define Download/brcmfmac43430_sdio_txt
-  FILE:=$(BRCMFMAC43430_SDIO_FILE).txt
-  URL:=$(BRCMFMAC43430_SDIO_URL)
-  URL_FILE:=brcmfmac43430-sdio.txt
-  MD5SUM:=8c3cb6d8f0609b43f09d083b4006ec5a
-endef
-$(eval $(call Download,brcmfmac43430_sdio_txt))
-
-define Package/brcmfmac-firmware-43430-sdio
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  TITLE:=Broadcom BCM43430 FullMac SDIO firmware
-  URL:=http://www.broadcom.com/
-endef
-
-define Package/brcmfmac-firmware-43430-sdio/description
-	Broadcom BCM43430 fullmac SDIO firmware
-endef
-
-define Build/Prepare
-	rm -rf $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_BUILD_DIR)
-	cp $(DL_DIR)/$(BRCMFMAC43430_SDIO_FILE).bin $(PKG_BUILD_DIR)/brcmfmac43430-sdio.bin
-	cp $(DL_DIR)/$(BRCMFMAC43430_SDIO_FILE).txt $(PKG_BUILD_DIR)/brcmfmac43430-sdio.txt
-endef
-
-define Build/Compile
-	true
-endef
-
-define Package/brcmfmac-firmware-43430-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43430-sdio.bin $(1)/lib/firmware/brcm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43430-sdio.txt $(1)/lib/firmware/brcm/
-endef
-
-$(eval $(call BuildPackage,brcmfmac-firmware-43430-sdio))
diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk
index 3bb147829e..c2b6916b23 100644
--- a/package/firmware/linux-firmware/broadcom.mk
+++ b/package/firmware/linux-firmware/broadcom.mk
@@ -34,6 +34,15 @@ define Package/brcmfmac-firmware-43362-sdio/install
 endef
 $(eval $(call BuildPackage,brcmfmac-firmware-43362-sdio))
 
+Package/brcmfmac-firmware-43430-sdio = $(call Package/firmware-default,Broadcom BCM43430 FullMac SDIO firmware)
+define Package/brcmfmac-firmware-43430-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43430-sdio.bin \
+		$(1)/lib/firmware/brcm/brcmfmac43430-sdio.bin
+endef
+$(eval $(call BuildPackage,brcmfmac-firmware-43430-sdio))
+
 Package/brcmfmac-firmware-usb = $(call Package/firmware-default,Broadcom BCM43xx fullmac USB firmware)
 define Package/brcmfmac-firmware-usb/install
 	$(INSTALL_DIR) $(1)/lib/firmware/brcm
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
new file mode 100644
index 0000000000..ea4f648a18
--- /dev/null
+++ b/target/linux/brcm2708/base-files/lib/firmware/brcm/brcmfmac43430-sdio.txt
@@ -0,0 +1,66 @@
+# 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