[meta-freescale] [PATCH] firmware-imx: split sdma into their own packages

[meta-freescale] [PATCH] firmware-imx: split sdma into their own packages

[Ming Liu]

From: Ming Liu <liu.ming50@gmail.com>

The sdma firmware of mx7d/mx6 are being installed to
${base_libdir}/firmware/imx/sdma, so they should be split into their
own packages by matching that directory.

Also change MACHINE_FIRMWARE to include these sdma firmware packages.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
 conf/machine/include/imx-base.inc              | 6 +++---
 recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index a3532f8..3051fcc 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -192,8 +192,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \
 # Firmware
 MACHINE_FIRMWARE ?= ""
 MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25"
-MACHINE_FIRMWARE_append_mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc"
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-imx-sdma-imx6q"
+MACHINE_FIRMWARE_append_mx7d = " firmware-imx-sdma-imx7d firmware-imx-epdc"
+MACHINE_FIRMWARE_append_mx6 = " firmware-imx-sdma-imx6q"
 MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
 MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc"
@@ -202,7 +202,7 @@ MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
 MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
 MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8qxp"
-MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+MACHINE_FIRMWARE_append_use-mainline-bsp = " firmware-imx-sdma-imx6q firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 # FIXME: Needs addition of firmware-imx of official BSPs
 #MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb b/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb
index 96a09e3..eccc539 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb
@@ -60,6 +60,13 @@ python populate_packages_prepend() {
                       description='Freescale IMX Firmware %s',
                       extra_depends='',
                       prepend=True)
+
+    imxsdmadir = bb.data.expand('${base_libdir}/firmware/imx/sdma', d)
+    do_split_packages(d, imxsdmadir, '^sdma-([^-]*).*\.bin',
+                      output_pattern='firmware-imx-sdma-%s',
+                      description='Freescale IMX Firmware %s',
+                      extra_depends='',
+                      prepend=True)
 }
 
 ALLOW_EMPTY_${PN} = "1"
-- 
2.7.4