All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92)
@ 2022-01-18 21:14 Peter Seiderer
  2022-01-18 21:14 ` [Buildroot] [PATCH v1 2/6] package/rpi-firmware: bump version to 3f20b83 Peter Seiderer
                   ` (5 more replies)
  0 siblings, 6 replies; 8+ messages in thread
From: Peter Seiderer @ 2022-01-18 21:14 UTC (permalink / raw)
  To: buildroot; +Cc: Martin Bark, Julien Grossholtz, Mahyar Koshkouei

Now based on 5.10.92 (from 5.10.78).

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 configs/raspberrypi0_defconfig        | 2 +-
 configs/raspberrypi0w_defconfig       | 2 +-
 configs/raspberrypi2_defconfig        | 2 +-
 configs/raspberrypi3_64_defconfig     | 2 +-
 configs/raspberrypi3_defconfig        | 2 +-
 configs/raspberrypi3_qt5we_defconfig  | 2 +-
 configs/raspberrypi4_64_defconfig     | 2 +-
 configs/raspberrypi4_defconfig        | 2 +-
 configs/raspberrypi_defconfig         | 2 +-
 configs/raspberrypicm4io_64_defconfig | 2 +-
 configs/raspberrypicm4io_defconfig    | 2 +-
 configs/raspberrypizero2w_defconfig   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig
index 64f7a93377..4506e94bce 100644
--- a/configs/raspberrypi0_defconfig
+++ b/configs/raspberrypi0_defconfig
@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B from the kernel sources: the zero is the same
diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig
index f3e7c453ab..7a35794c2d 100644
--- a/configs/raspberrypi0w_defconfig
+++ b/configs/raspberrypi0w_defconfig
@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 7befbf07e6..9b484c5588 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig
index ebb6e2252b..4d838ae0e8 100644
--- a/configs/raspberrypi3_64_defconfig
+++ b/configs/raspberrypi3_64_defconfig
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 6a9c4e0d02..0a59ab42a9 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig
index 7d06b0bb5e..40d0c0f888 100644
--- a/configs/raspberrypi3_qt5we_defconfig
+++ b/configs/raspberrypi3_qt5we_defconfig
@@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig
index 2b5446d8f1..5942f7c4e1 100644
--- a/configs/raspberrypi4_64_defconfig
+++ b/configs/raspberrypi4_64_defconfig
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig
index ac555ddd5e..4e5580c140 100644
--- a/configs/raspberrypi4_defconfig
+++ b/configs/raspberrypi4_defconfig
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 257e59536e..cca53f9b37 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig
index 1ab379c557..29cb0472d7 100644
--- a/configs/raspberrypicm4io_64_defconfig
+++ b/configs/raspberrypicm4io_64_defconfig
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig
index 9941754e25..017aecc0dd 100644
--- a/configs/raspberrypicm4io_defconfig
+++ b/configs/raspberrypicm4io_defconfig
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 
 # Build the DTB from the kernel sources
diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig
index ddd6b97b06..2ea503ca24 100644
--- a/configs/raspberrypizero2w_defconfig
+++ b/configs/raspberrypizero2w_defconfig
@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v1 2/6] package/rpi-firmware: bump version to 3f20b83
  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 ` Peter Seiderer
  2022-01-18 21:14 ` [Buildroot] [PATCH v1 3/6] package/rpi-userland: bump version to 14b90ff Peter Seiderer
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Peter Seiderer @ 2022-01-18 21:14 UTC (permalink / raw)
  To: buildroot; +Cc: Martin Bark, Julien Grossholtz, Mahyar Koshkouei

Changelog:

  095deea759 kernel: overlays: vc4-kms-v3d: Change composite handling
  2e9b609e53c kernel: Bump to 5.10.79
  12bc6e36773 firmware: dtoverlay: Rebase aliases in overlays like labels
  24d966d35bb kernel: Bump to 5.10.81
  ca52e7c1303 kernel: edt-ft5x06 touchscreen fixes
  1a0297bfbf7 kernel: Bump to 5.10.82
  0a1a871d04c kernel: Fix for IN Token of USB Endpoint 1 stopping occasionally on Pi 4
  303d0012cd7 kernel: Bump to 5.10.83
  bd8b6d5dc8e kernel: Bump to 5.10.85
  56f1b8bbc88 kernel: Bump to 5.10.87
  536baf33ae9 kernel: Bump to 5.10.88
  ce71e3e9b34 kernel: Bump to 5.10.89
  19b570d0d6a firmware: arm-loader: Fix kernel8.img selection on 2837 with arm_64bit=1
  fbbde90b709 kernel: drm/vc4: fix non-working audio on RPi3 and no video with DVI
  165bd7bc562 firmware: improve firmware camera detection
  318e3373496 kernel: Bump to 5.10.90
  175984a6dc4 kernel: drm/vc4: Add alpha_blend_mode property to each plane
  20c5829b0af kernel: Bump to 5.10.92
  3f20b832b27 firmware: arm_loader: Only clip min/max to the same value for turbo clocks

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/rpi-firmware/rpi-firmware.hash | 2 +-
 package/rpi-firmware/rpi-firmware.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
index 7cbfd1b249..ec13115f3b 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  a079a31fc80a23421589edcacef94faa713b12d3e77b92710ae2594c8d549477  rpi-firmware-fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25.tar.gz
+sha256  33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e  rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz
 sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index f773f83999..b46a7f5270 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25
+RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v1 3/6] package/rpi-userland: bump version to 14b90ff
  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 ` Peter Seiderer
  2022-01-18 21:14 ` [Buildroot] [PATCH v1 4/6] package/rpi-bt-firmware: bump version to ea9963f Peter Seiderer
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Peter Seiderer @ 2022-01-18 21:14 UTC (permalink / raw)
  To: buildroot; +Cc: Martin Bark, Julien Grossholtz, Mahyar Koshkouei

Changelog:

  f5404b2 raspicam: Check system is running legacy camera stack
  14b90ff mmal: Hack to make mmal core register VideoCore components

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/rpi-userland/rpi-userland.hash | 2 +-
 package/rpi-userland/rpi-userland.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash
index 8ea184a4f6..b837cfe709 100644
--- a/package/rpi-userland/rpi-userland.hash
+++ b/package/rpi-userland/rpi-userland.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  16c01befff64ebc11a0554e487b00939ed7a716f68dc795db4880b35bb25fa41  rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz
+sha256  bb682f3c20bc5c7877531d5666c8dcc674a2f347aa792cf979dc0b07b6261e77  rpi-userland-14b90ff9d9f031391a299e6e006965d02bfd1bb1.tar.gz
 sha256  bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5  LICENCE
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 09a7f6af74..84050b6df3 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = bab9bf8790cd69660d443ce43b4e372999f3f7ac
+RPI_USERLAND_VERSION = 14b90ff9d9f031391a299e6e006965d02bfd1bb1
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3-Clause
 RPI_USERLAND_LICENSE_FILES = LICENCE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v1 4/6] package/rpi-bt-firmware: bump version to ea9963f
  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 ` Peter Seiderer
  2022-01-18 21:14 ` [Buildroot] [PATCH v1 5/6] package/rpi-wifi-firmware " Peter Seiderer
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Peter Seiderer @ 2022-01-18 21:14 UTC (permalink / raw)
  To: buildroot; +Cc: Martin Bark, Julien Grossholtz, Mahyar Koshkouei

Chanelog (since 3888ba2):

  - Sync with RPi-Distro repo
    Switch to "bullseye" branch which moved several firmware files to
    the cypress dir.
    Add 43438 firmware 7.45.98.118 + external clm_blob
    Add 43455 firmware 7.45.241 and clm_blob

  - README.md: update link to RPi-distro repo wifi firmware files
  - Merge pull request #19 from HiassofT/2021-12

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +-
 package/rpi-bt-firmware/rpi-bt-firmware.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash
index 7e60aa4632..a575a02e97 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.hash
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade  rpi-bt-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz
+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
index 8d658ce435..f2d54f33bf 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.mk
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_BT_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef
+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
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v1 5/6] package/rpi-wifi-firmware bump version to ea9963f
  2022-01-18 21:14 [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Peter Seiderer
                   ` (2 preceding siblings ...)
  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 ` 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:25 ` [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Yann E. MORIN
  5 siblings, 0 replies; 8+ messages in thread
From: Peter Seiderer @ 2022-01-18 21:14 UTC (permalink / raw)
  To: buildroot; +Cc: Martin Bark, Julien Grossholtz, Mahyar Koshkouei

- add cypress files

- update links

Chanelog (since 3888ba2):

  - Sync with RPi-Distro repo
    Switch to "bullseye" branch which moved several firmware files to
    the cypress dir.
    Add 43438 firmware 7.45.98.118 + external clm_blob
    Add 43455 firmware 7.45.241 and clm_blob

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/rpi-wifi-firmware/rpi-wifi-firmware.hash |  2 +-
 package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
index 09cd197dd8..7ff47b8cfe 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade  rpi-wifi-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz
+sha256  e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d  rpi-wifi-firmware-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.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 a467f2c7b4..b54cd359a4 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_WIFI_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef
+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
@@ -12,9 +12,17 @@ RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
 define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
 	$(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
+	ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob
+	ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+	ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
+	ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin
+	ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
 	ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
 	ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
 	ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress
+	$(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress
 endef
 
 $(eval $(generic-package))
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware)
  2022-01-18 21:14 [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Peter Seiderer
                   ` (3 preceding siblings ...)
  2022-01-18 21:14 ` [Buildroot] [PATCH v1 5/6] package/rpi-wifi-firmware " Peter Seiderer
@ 2022-01-18 21:14 ` Peter Seiderer
  2022-01-19 21:28   ` Yann E. MORIN
  2022-01-19 21:25 ` [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Yann E. MORIN
  5 siblings, 1 reply; 8+ messages in thread
From: Peter Seiderer @ 2022-01-18 21:14 UTC (permalink / raw)
  To: buildroot; +Cc: Martin Bark, Julien Grossholtz, Mahyar Koshkouei

Move rpi-bt-firmware and rpi-wifi-firmware packages to the new
brcmfmac_sdio-firmware-rpi one (as they share the same donwload).

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...
---
 Config.in.legacy                              | 18 ++++++++++++
 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}            | 27 +++++++++++++----
 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, 71 insertions(+), 53 deletions(-)
 create mode 100644 package/brcmfmac_sdio-firmware-rpi/Config.in
 rename package/{rpi-wifi-firmware/rpi-wifi-firmware.hash => brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash} (68%)
 rename package/{rpi-wifi-firmware/rpi-wifi-firmware.mk => brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk} (61%)
 delete mode 100644 package/rpi-bt-firmware/Config.in
 delete mode 100644 package/rpi-bt-firmware/rpi-bt-firmware.hash
 delete mode 100644 package/rpi-bt-firmware/rpi-bt-firmware.mk
 delete mode 100644 package/rpi-wifi-firmware/Config.in

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"
+	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

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92)
  2022-01-18 21:14 [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Peter Seiderer
                   ` (4 preceding siblings ...)
  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:25 ` Yann E. MORIN
  5 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2022-01-19 21:25 UTC (permalink / raw)
  To: Peter Seiderer
  Cc: Mahyar Koshkouei, Martin Bark, Julien Grossholtz, buildroot

Peter, All,

On 2022-01-18 22:14 +0100, Peter Seiderer spake thusly:
> Now based on 5.10.92 (from 5.10.78).
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Series of 6 patches applied to master, thanks.

I'll further reply to patch 6 with details specific to it...

Regards,
Yann E. MORIN.

> ---
>  configs/raspberrypi0_defconfig        | 2 +-
>  configs/raspberrypi0w_defconfig       | 2 +-
>  configs/raspberrypi2_defconfig        | 2 +-
>  configs/raspberrypi3_64_defconfig     | 2 +-
>  configs/raspberrypi3_defconfig        | 2 +-
>  configs/raspberrypi3_qt5we_defconfig  | 2 +-
>  configs/raspberrypi4_64_defconfig     | 2 +-
>  configs/raspberrypi4_defconfig        | 2 +-
>  configs/raspberrypi_defconfig         | 2 +-
>  configs/raspberrypicm4io_64_defconfig | 2 +-
>  configs/raspberrypicm4io_defconfig    | 2 +-
>  configs/raspberrypizero2w_defconfig   | 2 +-
>  12 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig
> index 64f7a93377..4506e94bce 100644
> --- a/configs/raspberrypi0_defconfig
> +++ b/configs/raspberrypi0_defconfig
> @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
>  
>  # Build the DTBs for A/B from the kernel sources: the zero is the same
> diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig
> index f3e7c453ab..7a35794c2d 100644
> --- a/configs/raspberrypi0w_defconfig
> +++ b/configs/raspberrypi0w_defconfig
> @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
>  BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
> diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
> index 7befbf07e6..9b484c5588 100644
> --- a/configs/raspberrypi2_defconfig
> +++ b/configs/raspberrypi2_defconfig
> @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig
> index ebb6e2252b..4d838ae0e8 100644
> --- a/configs/raspberrypi3_64_defconfig
> +++ b/configs/raspberrypi3_64_defconfig
> @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
> index 6a9c4e0d02..0a59ab42a9 100644
> --- a/configs/raspberrypi3_defconfig
> +++ b/configs/raspberrypi3_defconfig
> @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig
> index 7d06b0bb5e..40d0c0f888 100644
> --- a/configs/raspberrypi3_qt5we_defconfig
> +++ b/configs/raspberrypi3_qt5we_defconfig
> @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig
> index 2b5446d8f1..5942f7c4e1 100644
> --- a/configs/raspberrypi4_64_defconfig
> +++ b/configs/raspberrypi4_64_defconfig
> @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig
> index ac555ddd5e..4e5580c140 100644
> --- a/configs/raspberrypi4_defconfig
> +++ b/configs/raspberrypi4_defconfig
> @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
> index 257e59536e..cca53f9b37 100644
> --- a/configs/raspberrypi_defconfig
> +++ b/configs/raspberrypi_defconfig
> @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
>  
>  # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
> diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig
> index 1ab379c557..29cb0472d7 100644
> --- a/configs/raspberrypicm4io_64_defconfig
> +++ b/configs/raspberrypicm4io_64_defconfig
> @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig
> index 9941754e25..017aecc0dd 100644
> --- a/configs/raspberrypicm4io_defconfig
> +++ b/configs/raspberrypicm4io_defconfig
> @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
>  
>  # Build the DTB from the kernel sources
> diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig
> index ddd6b97b06..2ea503ca24 100644
> --- a/configs/raspberrypizero2w_defconfig
> +++ b/configs/raspberrypizero2w_defconfig
> @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz"
> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz"
>  BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
>  
>  # Build the DTB from the kernel sources
> -- 
> 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

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH v1 6/6] package/brcmfmac_sdio-firmware-rpi: new package (former rpi-bt-firmware/rpi-wifi-firmware)
  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
  0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2022-01-19 21:28 UTC (permalink / raw)
  To: Peter Seiderer
  Cc: Mahyar Koshkouei, Martin Bark, Julien Grossholtz, buildroot

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-01-19 21:28 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2022-01-19 21:25 ` [Buildroot] [PATCH v1 1/6] configs/raspberrypi*: bump kernel version to 0b54dbd (5.10.92) Yann E. MORIN

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.