firmware-imx: Move VPU and SDMA firmware files to the correct path

During update the location of SDMA and VPU firmware files were moved to
the 'imx' sub-directory, inside /lib/firmware, but it is not where the
Linux kernel looks for it. We moved the those to /lib/firmware/sdma and
/lib/firmware/vpu, respectively, so the probe now works as expected.

Fixes: b3eff3e4 "firmware-imx: upgrade to version 8.8"
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Change-Id: I42396f9bb606e8c4761c368150dba5090c66bf4c
(cherry picked from commit 979cac97c80fd42bd77c4920b28e88a8ed9b70de)

diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.8.bb b/recipes-bsp/firmware-imx/firmware-imx_8.8.bb
index aff22ba6e86c4ba567059e16a007b9a998a5a737..79c0c272d90647cc9c82c64dc9fe35ef21e5a13e 100644 (file)
--- a/recipes-bsp/firmware-imx/firmware-imx_8.8.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.8.bb
@@ -14,8 +14,8 @@ do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/imx
 
     # SDMA Firmware section
-    install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma
-    install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
+    install -d ${D}${nonarch_base_libdir}/firmware/sdma
+    install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/sdma
 
     # EASRC Firmware section
     install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc
@@ -50,13 +50,13 @@ do_install() {
     # NOTE:
     # Do the same thing as above for HDMI - only install a pre-defined list of firmware files,
     # as some of other files are provided by packages from other recipes.
-    install -d ${D}${nonarch_base_libdir}/firmware/imx/vpu
-    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx27_TO1.bin ${D}${nonarch_base_libdir}/firmware/imx/vpu
-    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx27_TO2.bin ${D}${nonarch_base_libdir}/firmware/imx/vpu
-    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx51.bin ${D}${nonarch_base_libdir}/firmware/imx/vpu
-    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx53.bin ${D}${nonarch_base_libdir}/firmware/imx/vpu
-    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx6d.bin ${D}${nonarch_base_libdir}/firmware/imx/vpu
-    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx6q.bin ${D}${nonarch_base_libdir}/firmware/imx/vpu
+    install -d ${D}${nonarch_base_libdir}/firmware/vpu
+    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx27_TO1.bin ${D}${nonarch_base_libdir}/firmware/vpu
+    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx27_TO2.bin ${D}${nonarch_base_libdir}/firmware/vpu
+    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx51.bin ${D}${nonarch_base_libdir}/firmware/vpu
+    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx53.bin ${D}${nonarch_base_libdir}/firmware/vpu
+    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx6d.bin ${D}${nonarch_base_libdir}/firmware/vpu
+    install -m 0644 ${S}/firmware/vpu/vpu_fw_imx6q.bin ${D}${nonarch_base_libdir}/firmware/vpu
 }
 
 #
@@ -76,14 +76,14 @@ python populate_packages_prepend() {
                       extra_depends='',
                       prepend=True)
 
-    vpudir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/vpu', d)
+    vpudir = bb.data.expand('${nonarch_base_libdir}/firmware/vpu', d)
     do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
                       output_pattern='firmware-imx-vpu-%s',
                       description='Freescale IMX VPU Firmware [%s]',
                       extra_depends='',
                       prepend=True)
 
-    sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/sdma', d)
+    sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/sdma', d)
     do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
                       output_pattern='firmware-imx-sdma-%s',
                       description='Freescale IMX SDMA Firmware [%s]',