mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 05:23:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt,wifi}-firmware

Browse Source 
Move rpi-bt-firmware and rpi-wifi-firmware packages to the new
brcmfmac_sdio-firmware-rpi one (as they are the same upstream
package).

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[yann.morin.1998@free.fr:
  - fix check-package
  - legacy symbols still depend on arm || aarch64
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Peter Seiderer 2022-01-18 22:14:34 +01:00 committed by Yann E. MORIN
parent 5ccb5f9dbe
commit 7527324132
10 changed files with 72 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Config.in.legacy
View File

@ -146,6 +146,26 @@ endif
comment "Legacy options removed in 2022.02"
config BR2_PACKAGE_RPI_BT_FIRMWARE
bool "rpi-bt-firmware package was renamed"
depends on BR2_arm || BR2_aarch64
select BR2_LEGACY
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT
help
Package rpi-bt-firmware was moved as option to
package brcmfmac-sdio-firmware-rpi.
config BR2_PACKAGE_RPI_WIFI_FIRMWARE
bool "rpi-wifi-firmware package was renamed"
depends on BR2_arm || BR2_aarch64
select BR2_LEGACY
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI
help
Package rpi-wifi-firmware was moved as option to
package brcmfmac-sdio-firmware-rpi.
config BR2_PACKAGE_HOST_GDB_PYTHON
bool "GDB Python2 support removed"
select BR2_LEGACY

3
DEVELOPERS
View File

@ -1832,12 +1832,11 @@ F: configs/qemu_riscv64_virt_defconfig
N: Martin Bark <martin@barkynet.com>
F: board/raspberrypi/
F: configs/raspberrypi3_defconfig
F: package/brcmfmac_sdio-firmware-rpi/
F: package/ca-certificates/
F: package/connman/
F: package/nodejs/
F: package/rpi-bt-firmware/
F: package/rpi-firmware/
F: package/rpi-wifi-firmware/
F: package/tzdata/
F: package/zic/

3
package/Config.in
View File

@ -420,14 +420,13 @@ menu "Firmware"
source "package/am33x-cm3/Config.in"
source "package/armbian-firmware/Config.in"
source "package/b43-firmware/Config.in"
source "package/brcmfmac_sdio-firmware-rpi/Config.in"
source "package/linux-firmware/Config.in"
source "package/murata-cyw-fw/Config.in"
source "package/odroidc2-firmware/Config.in"
source "package/qcom-db410c-firmware/Config.in"
source "package/rcw-smarc-sal28/Config.in"
source "package/rpi-bt-firmware/Config.in"
source "package/rpi-firmware/Config.in"
source "package/rpi-wifi-firmware/Config.in"
source "package/sunxi-boards/Config.in"
source "package/ts4900-fpga/Config.in"
source "package/ux500-firmware/Config.in"

29
package/brcmfmac_sdio-firmware-rpi/Config.in Normal file
View File

@ -0,0 +1,29 @@
config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
bool "brcmfmac-sdio-firmware-rpi"
depends on BR2_arm || BR2_aarch64
help
Raspberry Broadcom Bluetooth and Wifi firmware.
https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi
if BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT
bool "brcmfmac-sdio-firmware-rpi-bt"
help
Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module
firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0
Bluetooth module firmware.
config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI
bool "brcmfmac-sdio-firmware-rpi-wifi"
depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
help
Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module
NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455
wifi module NVRAM data.
comment "brcmfmac-sdio-firmware-rpi-wifi conflicts with linux-firmware Broadcom BRCM bcm43xx"
depends on BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
endif

2
package/rpi-wifi-firmware/rpi-wifi-firmware.hash → package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz
sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx

26
package/rpi-wifi-firmware/rpi-wifi-firmware.mk → package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
View File

@ -1,15 +1,23 @@
################################################################################
#
# rpi-wifi-firmware
# brcmfmac_sdio-firmware-rpi
#
################################################################################
RPI_WIFI_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d
RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d
BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION))
BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY
BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx
define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y)
define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT
$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
$(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm
endef
endif
ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y)
define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI
$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin
@ -24,5 +32,11 @@ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
$(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress
$(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress
endef
endif
define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS
$(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT)
$(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI)
endef
$(eval $(generic-package))

9
package/rpi-bt-firmware/Config.in
View File

@ -1,9 +0,0 @@
config BR2_PACKAGE_RPI_BT_FIRMWARE
bool "rpi-bt-firmware"
depends on BR2_arm || BR2_aarch64
help
Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module
firmware. Raspberry Pi 3 Model B+ Broadcom BCM4345C0
Bluetooth module firmware.
https://github.com/LibreELEC/brcmfmac_sdio-firmware-rpi

3
package/rpi-bt-firmware/rpi-bt-firmware.hash
View File

@ -1,3 +0,0 @@
# Locally computed
sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx

17
package/rpi-bt-firmware/rpi-bt-firmware.mk
View File

@ -1,17 +0,0 @@
################################################################################
#
# rpi-bt-firmware
#
################################################################################
RPI_BT_FIRMWARE_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d
RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION))
RPI_BT_FIRMWARE_LICENSE = PROPRIETARY
RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS
$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
$(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm
endef
$(eval $(generic-package))

13
package/rpi-wifi-firmware/Config.in
View File

@ -1,13 +0,0 @@
config BR2_PACKAGE_RPI_WIFI_FIRMWARE
bool "rpi-wifi-firmware"
depends on BR2_arm || BR2_aarch64
depends on !BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX
help
Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module
NVRAM data. Raspberry Pi 3 Model B+ Broadcom BCM43455
wifi module NVRAM data.
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