* [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware
@ 2022-01-19 21:24 Yann E. MORIN
2022-01-21 7:50 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2022-01-19 21:24 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=7527324132878f98999539bdd97bd3518747f585
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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>
---
Config.in.legacy | 20 +++++++++++++++
DEVELOPERS | 3 +--
package/Config.in | 3 +--
package/brcmfmac_sdio-firmware-rpi/Config.in | 29 ++++++++++++++++++++++
.../brcmfmac_sdio-firmware-rpi.hash} | 2 +-
.../brcmfmac_sdio-firmware-rpi.mk} | 26 ++++++++++++++-----
package/rpi-bt-firmware/Config.in | 9 -------
package/rpi-bt-firmware/rpi-bt-firmware.hash | 3 ---
package/rpi-bt-firmware/rpi-bt-firmware.mk | 17 -------------
package/rpi-wifi-firmware/Config.in | 13 ----------
10 files changed, 72 insertions(+), 53 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index dd64b7da1b..c11cb846fb 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -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
diff --git a/DEVELOPERS b/DEVELOPERS
index a91e2dfcde..dc810b6fe1 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -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/
diff --git a/package/Config.in b/package/Config.in
index 4df1474b91..85188ff873 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in
new file mode 100644
index 0000000000..73f400a2b7
--- /dev/null
+++ b/package/brcmfmac_sdio-firmware-rpi/Config.in
@@ -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
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash
similarity index 68%
rename from package/rpi-wifi-firmware/rpi-wifi-firmware.hash
rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash
index 7ff47b8cfe..a12e92cbac 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash
@@ -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
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
similarity index 62%
rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk
rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
index b54cd359a4..5332bf53d7 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
@@ -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))
diff --git a/package/rpi-bt-firmware/Config.in b/package/rpi-bt-firmware/Config.in
deleted file mode 100644
index 45643d6a52..0000000000
--- a/package/rpi-bt-firmware/Config.in
+++ /dev/null
@@ -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
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash
deleted file mode 100644
index a575a02e97..0000000000
--- a/package/rpi-bt-firmware/rpi-bt-firmware.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally computed
-sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d rpi-bt-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz
-sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk
deleted file mode 100644
index f2d54f33bf..0000000000
--- a/package/rpi-bt-firmware/rpi-bt-firmware.mk
+++ /dev/null
@@ -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))
diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in
deleted file mode 100644
index 7e81b286c0..0000000000
--- a/package/rpi-wifi-firmware/Config.in
+++ /dev/null
@@ -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
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware
2022-01-19 21:24 [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware Yann E. MORIN
@ 2022-01-21 7:50 ` Thomas Petazzoni
2022-01-21 8:04 ` Yann E. MORIN
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2022-01-21 7:50 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: buildroot
Hello,
On Wed, 19 Jan 2022 22:24:11 +0100
Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> ################################################################################
> #
> -# rpi-wifi-firmware
> +# brcmfmac_sdio-firmware-rpi
A quick nitpicking comment: I tend to dislike _ in package names, and
even more so when it's mixed with - in the package name. As it doesn't
affect the Config.in option name, perhaps it's still time to adjust
this to brcmfmac-sdio-firmware-rpi ?
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware
2022-01-21 7:50 ` Thomas Petazzoni
@ 2022-01-21 8:04 ` Yann E. MORIN
2022-01-21 13:24 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2022-01-21 8:04 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: buildroot
Thomas, All,
On 2022-01-21 08:50 +0100, Thomas Petazzoni spake thusly:
> On Wed, 19 Jan 2022 22:24:11 +0100
> Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> > ################################################################################
> > #
> > -# rpi-wifi-firmware
> > +# brcmfmac_sdio-firmware-rpi
> A quick nitpicking comment: I tend to dislike _ in package names, and
> even more so when it's mixed with - in the package name. As it doesn't
> affect the Config.in option name, perhaps it's still time to adjust
> this to brcmfmac-sdio-firmware-rpi ?
I don't like it much either. But the reason for the rename was to match
the upstream name, which is exactly what we suggest in the manual, and
that we argue for most of the time.
And we also already had bluez5_utils-headers and xutil_util-macros, and
78 packages in package/x11r7/
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware
2022-01-21 8:04 ` Yann E. MORIN
@ 2022-01-21 13:24 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2022-01-21 13:24 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: buildroot
On Fri, 21 Jan 2022 09:04:56 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> I don't like it much either. But the reason for the rename was to match
> the upstream name, which is exactly what we suggest in the manual, and
> that we argue for most of the time.
Yeah, I usually make _ to - an exception to this.
> And we also already had bluez5_utils-headers and xutil_util-macros, and
> 78 packages in package/x11r7/
Which are all examples that I dislike a lot :-)
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-21 13:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-19 21:24 [Buildroot] [git commit] package/brcmfmac_sdio-firmware-rpi: merge of rpi-{bt, wifi}-firmware Yann E. MORIN
2022-01-21 7:50 ` Thomas Petazzoni
2022-01-21 8:04 ` Yann E. MORIN
2022-01-21 13:24 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.