From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Peter Seiderer <ps.report@gmx.net>
Cc: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>,
Martin Bark <martin@barkynet.com>,
Julien Grossholtz <julien.grossholtz@openest.io>,
buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware)
Date: Wed, 19 Jan 2022 22:28:19 +0100 [thread overview]
Message-ID: <20220119212819.GE3095239@scaer> (raw)
In-Reply-To: <20220118211434.9854-6-ps.report@gmx.net>
Peter, All,
On 2022-01-18 22:14 +0100, Peter Seiderer spake thusly:
> Move rpi-bt-firmware and rpi-wifi-firmware packages to the new
> brcmfmac_sdio-firmware-rpi one (as they share the same donwload).
$ make check-package
Config.in.legacy:157: line contains trailing whitespace
Config.in.legacy:166: line contains trailing whitespace
package/Config.in:423: Packages in: menu "Firmware",
are not alphabetically ordered;
correct order: '-', '_', digits, capitals, lowercase;
first incorrect package: b43-firmware
package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:12: consecutive empty lines
package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:15: expected indent with tabs
package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk:16: expected indent with tabs
I've fixed that.
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Notes:
> - patch moved after the rpi-bt-firmware/rpi-wifi-firmware version bump
> as it saves some code/download duplication but the new package/name
> is harder to find/remember...
Yet, the new package name is the upstream package name, which I believe
is better to follow.
[--SNIP--]
> diff --git a/Config.in.legacy b/Config.in.legacy
> index dd64b7da1b..465d7bef90 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,24 @@ endif
>
> comment "Legacy options removed in 2022.02"
>
> +config BR2_PACKAGE_RPI_BT_FIRMWARE
> + bool "rpi-bt-firmware package was renamed"
The original symbols did depend on arm || aarch64, so I kept that
dependency for both legacy symbols.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> + 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"
> + 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..3b38af7232 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -419,15 +419,14 @@ menu "Hardware handling"
> menu "Firmware"
> source "package/am33x-cm3/Config.in"
> source "package/armbian-firmware/Config.in"
> + source "package/brcmfmac_sdio-firmware-rpi/Config.in"
> source "package/b43-firmware/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 61%
> rename from package/rpi-wifi-firmware/rpi-wifi-firmware.mk
> rename to package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
> index b54cd359a4..4d1f285442 100644
> --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
> +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
> @@ -1,15 +1,24 @@
> ################################################################################
> #
> -# 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 +33,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
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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
next prev parent reply other threads:[~2022-01-19 21:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-18 21:14 [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Peter Seiderer
2022-01-18 21:14 ` [Buildroot] [PATCH v1 2/6] package/rpi-firmware: bump version to 3f20b83 Peter Seiderer
2022-01-18 21:14 ` [Buildroot] [PATCH v1 3/6] package/rpi-userland: bump version to 14b90ff Peter Seiderer
2022-01-18 21:14 ` [Buildroot] [PATCH v1 4/6] package/rpi-bt-firmware: bump version to ea9963f Peter Seiderer
2022-01-18 21:14 ` [Buildroot] [PATCH v1 5/6] package/rpi-wifi-firmware " Peter Seiderer
2022-01-18 21:14 ` [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware) Peter Seiderer
2022-01-19 21:28 ` Yann E. MORIN [this message]
2022-01-19 21:25 ` [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220119212819.GE3095239@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=julien.grossholtz@openest.io \
--cc=mahyar.koshkouei@gmail.com \
--cc=martin@barkynet.com \
--cc=ps.report@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox