package/rpi-wifi-firmware: change to LibreELEC github repo

Include brcmfmac43455 firmware for the rpi3 b+

Signed-off-by: Martin Bark <martin@barkynet.com>
Cc: Jens Maus <mail@jens-maus.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in
index 2c87c758427d174acb8da99c6a318a51f61b364c..7e81b286c0c96ff7e0b28f8a1e7964a1f3333c31 100644 (file)
--- a/package/rpi-wifi-firmware/Config.in
+++ b/package/rpi-wifi-firmware/Config.in
@@ -1,10 +1,13 @@
 config BR2_PACKAGE_RPI_WIFI_FIRMWARE
        bool "rpi-wifi-firmware"
        depends on BR2_arm || BR2_aarch64
-       select BR2_PACKAGE_LINUX_FIRMWARE
-       select BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX # runtime
+       depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
        help
          Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module
-         NVRAM data.
+         NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455
+         wifi module NVRAM data.
 
-         https://github.com/RPi-Distro/firmware-nonfree/
+         https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi
+
+comment "rpi-wifi-firmware conflicts with linux-firmware Broadcom BRCM bcm43xx"
+       depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX

diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
index c20506536f3fe1aa82a2221981e3a456bf6c8f53..bc0d7c8b02ce60a7e3d4fef619acc81ba0a4494a 100644 (file)
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256  872fde4f9942d9aba805880d6eaddfe050305626fd58ad955bfe77c04f6b75a5  brcmfmac43430-sdio.txt
+sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30  rpi-wifi-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz
+sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx

diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
index 83473d5bb9ccce503a5c971e70ef5368b26ba78f..32dd3e519b528261ad7730d14f595f94b82b852d 100644 (file)
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
@@ -4,20 +4,14 @@
 #
 ################################################################################
 
-RPI_WIFI_FIRMWARE_VERSION = 54bab3d6a6d43239c71d26464e6e10e5067ffea7
-# brcmfmac43430-sdio.bin comes from linux-firmware
-RPI_WIFI_FIRMWARE_SOURCE = brcmfmac43430-sdio.txt
-# git repo contains a lot of unrelated files
-RPI_WIFI_FIRMWARE_SITE = https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/$(RPI_WIFI_FIRMWARE_VERSION)/brcm80211/brcm
+RPI_WIFI_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907
+RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
 RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
-
-define RPI_WIFI_FIRMWARE_EXTRACT_CMDS
-       cp $(RPI_WIFI_FIRMWARE_DL_DIR)/$($(PKG)_SOURCE) $(@D)/
-endef
+RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
 
 define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
-       $(INSTALL) -D -m 0644 $(@D)/$(RPI_WIFI_FIRMWARE_SOURCE) \
-               $(TARGET_DIR)/lib/firmware/brcm/$(RPI_WIFI_FIRMWARE_SOURCE)
+       $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
+       $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
 endef
 
 $(eval $(generic-package))