Skip to contentSkip to conversation

package/linux-firmware: remove imx sdma firmware

PATCH New Romain Naour 3 participants 4 messages Jan 17, 2021 – Jan 18, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/linux-firmware: remove imx sdma firmware

As reported on the mailing list [1], the imx sdma firmwares for imx[6,7,8] are provided by two packages: firmware-imx and linux-firmware

$ sha256sum ./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
$ sha256sum  ./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin

Keep firmware-imx as the only imx sdma firmware provider.

[1] http://lists.busybox.net/pipermail/buildroot/2021-January/300938.html

Cc Fabio Estevam <[email protected]>
Cc Stephane Viau <[email protected]>
Cc Gary Bisson <[email protected]>
---
 Config.in.legacy                         | 8 ++++++++
 package/linux-firmware/Config.in         | 9 ---------
 package/linux-firmware/linux-firmware.mk | 6 ------
 3 files changed, 8 insertions(+), 15 deletions(-)
Config.in.legacy +8 -0
index 3c022d21d7..a322d18cb3 100644
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2021.02"
 
+config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
+	bool "imx sdma firmware is provided by firmware-imx"
+	select BR2_LEGACY
+	select BR2_PACKAGE_FIRMWARE_IMX
+	help
+	  linux-firmware provide the same firmware as firmware-imx.
+	  We prefer using firmware-imx as the only provider.
+
 config BR2_GDB_VERSION_8_2
 	bool "gdb 8.2.x has been removed"
 	select BR2_LEGACY
package/linux-firmware/Config.in +0 -9
index 8e71c21251..a41310ff2a 100644
@@ -459,15 +459,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XCx000
 
 endmenu
 
-menu "SoC Firmware"
-
-config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
-	bool "Freescale i.MX SDMA"
-	help
-	  Firmware files for i.MX SDMA.
-
-endmenu
-
 menu "Fibre Channel Adapter Firmware"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX
package/linux-firmware/linux-firmware.mk +0 -6
index 22fac9d7aa..f23da171c6 100644
@@ -64,12 +64,6 @@ LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom
 endif
 
-# Freescale i.MX SDMA
-ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA),y)
-LINUX_FIRMWARE_FILES += imx/sdma/sdma-imx6q.bin imx/sdma/sdma-imx7d.bin
-LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.sdma_firmware
-endif
-
 # rt2501/rt61
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y)
 LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin
Signature · 1 line
2.25.4
#1 lore raw

PATCH 1/1 package/linux-firmware: remove imx sdma firmware

Romain, All,

On 2021-01-17 14:31 +0100, Romain Naour spake thusly:

Quoted 12 lines

As reported on the mailing list [1], the imx sdma firmwares for imx[6,7,8] are provided by two packages: firmware-imx and linux-firmware

$ sha256sum ./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
$ sha256sum  ./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin
Quoted 8 lines

Keep firmware-imx as the only imx sdma firmware provider.

[1] http://lists.busybox.net/pipermail/buildroot/2021-January/300938.html

Cc Fabio Estevam <[email protected]>
Cc Stephane Viau <[email protected]>
Cc Gary Bisson <[email protected]>

At first, I was going to suggest that we should insteaddrop the separate firmware-imx package, and keep just linux-firmware.

But as explained in the thread you pointed in the commit log (?), firmware-imx also has firmwares for older CPUs, so I've added that as a justification why we keep it and not the option from linux-firmware.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 69 lines
---
 Config.in.legacy                         | 8 ++++++++
 package/linux-firmware/Config.in         | 9 ---------
 package/linux-firmware/linux-firmware.mk | 6 ------
 3 files changed, 8 insertions(+), 15 deletions(-)
Config.in.legacy +8 -0
index 3c022d21d7..a322d18cb3 100644
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2021.02"
 
+config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
+	bool "imx sdma firmware is provided by firmware-imx"
+	select BR2_LEGACY
+	select BR2_PACKAGE_FIRMWARE_IMX
+	help
+	  linux-firmware provide the same firmware as firmware-imx.
+	  We prefer using firmware-imx as the only provider.
+
 config BR2_GDB_VERSION_8_2
 	bool "gdb 8.2.x has been removed"
 	select BR2_LEGACY
package/linux-firmware/Config.in +0 -9
index 8e71c21251..a41310ff2a 100644
@@ -459,15 +459,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XCx000
 
 endmenu
 
-menu "SoC Firmware"
-
-config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
-	bool "Freescale i.MX SDMA"
-	help
-	  Firmware files for i.MX SDMA.
-
-endmenu
-
 menu "Fibre Channel Adapter Firmware"
 
 config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX
package/linux-firmware/linux-firmware.mk +0 -6
index 22fac9d7aa..f23da171c6 100644
@@ -64,12 +64,6 @@ LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom
 endif
 
-# Freescale i.MX SDMA
-ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA),y)
-LINUX_FIRMWARE_FILES += imx/sdma/sdma-imx6q.bin imx/sdma/sdma-imx7d.bin
-LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.sdma_firmware
-endif
-
 # rt2501/rt61
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y)
 LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin
Signature · 6 lines
2.25.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/linux-firmware: remove imx sdma firmware

In reply to Romain Naour

Hi Romain,

Quoted 31 lines · Romain Naour

As reported on the mailing list [1], the imx sdma firmwares for imx[6,7,8] are provided by two packages: firmware-imx and linux-firmware

$ sha256sum ./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
$ sha256sum  ./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin

Keep firmware-imx as the only imx sdma firmware provider.

[1] http://lists.busybox.net/pipermail/buildroot/2021-January/300938.html

Cc Fabio Estevam <[email protected]>
Cc Stephane Viau <[email protected]>
Cc Gary Bisson <[email protected]>
---
 Config.in.legacy                         | 8 ++++++++
 package/linux-firmware/Config.in         | 9 ---------
 package/linux-firmware/linux-firmware.mk | 6 ------
 3 files changed, 8 insertions(+), 15 deletions(-)
Config.in.legacy +0 -0
index 3c022d21d7..a322d18cb3 100644

Config.in.legacy endif · line 152

Quoted 7 lines
Config.in.legacy +4 -0
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2021.02"
 
+config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
+	bool "imx sdma firmware is provided by firmware-imx"
+	select BR2_LEGACY
+	select BR2_PACKAGE_FIRMWARE_IMX

I know it's too late as Yann already merged that commit, but I believe the above is wrong. You can't select this option unless BR2_PACKAGE_FREESCALE_IMX is also defined.

Regards,
Gary

#3 lore raw

PATCH 1/1 package/linux-firmware: remove imx sdma firmware

Hi Gary,

Le 18/01/2021 ? 09:00, Gary Bisson a ?crit?:

Quoted 37 lines

Hi Romain,

Quoted 34 lines · Romain Naour

As reported on the mailing list [1], the imx sdma firmwares for imx[6,7,8] are provided by two packages: firmware-imx and linux-firmware

$ sha256sum ./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./firmware-imx-8.10/firmware/sdma/sdma-imx6q.bin
$ sha256sum  ./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin
7790c161b7e013a9dbcbffb17cc5d4cb63d952949a505647e4679f02d04c4784
./linux-firmware-20201022/imx/sdma/sdma-imx6q.bin

Keep firmware-imx as the only imx sdma firmware provider.

[1] http://lists.busybox.net/pipermail/buildroot/2021-January/300938.html

Cc Fabio Estevam <[email protected]>
Cc Stephane Viau <[email protected]>
Cc Gary Bisson <[email protected]>
---
 Config.in.legacy                         | 8 ++++++++
 package/linux-firmware/Config.in         | 9 ---------
 package/linux-firmware/linux-firmware.mk | 6 ------
 3 files changed, 8 insertions(+), 15 deletions(-)
Config.in.legacy +0 -0
index 3c022d21d7..a322d18cb3 100644
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2021.02"
 
Quoted 8 lines

Config.in.legacy endif · line 152

Quoted 4 lines
Config.in.legacy +4 -0
+config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
+	bool "imx sdma firmware is provided by firmware-imx"
+	select BR2_LEGACY
+	select BR2_PACKAGE_FIRMWARE_IMX

I know it's too late as Yann already merged that commit, but I believe the above is wrong. You can't select this option unless BR2_PACKAGE_FREESCALE_IMX is also defined.

Indeed, BR2_PACKAGE_FREESCALE_IMX must be selected here.

Best regards,
Romain

Quoted 4 lines

Regards,
Gary