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

firmware-imx also has firmwares for older variants as well, so this is
what we keep as the only imx sdma firmware provider.

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

Signed-off-by: Romain Naour <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Stephane Viau <[email protected]>
Cc: Gary Bisson <[email protected]>
[[email protected]: explain why we keep firmware-imx]
Signed-off-by: Yann E. MORIN <[email protected]>

diff --git a/Config.in.legacy b/Config.in.legacy
index 3c022d21d74a1fde583b4fa0588b3082a1155297..a322d18cb3bbb06f96986c4d2304332d9b5056e3 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -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

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 8e71c212510508a723c026dade9a0094e9a78d46..a41310ff2a9ee300e282bd34a04b91318807b368 100644 (file)
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -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

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 22fac9d7aa4756d1339698c3fa7030f97d1efb1a..f23da171c6c0b3961c3e44c183dd574b1c8f7120 100644 (file)
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -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