From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 6 Oct 2020 01:44:57 +0000 (-0300)
Subject: Revert move of SDMA firmware
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ef814ffea33ac18e46f4d8e3cfc22f7ffc17ff48;p=meta-freescale.git

Revert move of SDMA firmware

I got under mistake here and moved the SDMA firmware files when the only
ones which should have been moved were the VPU ones. This commit
partially reverts 979cac97 "firmware-imx: Move VPU and SDMA firmware
files to the correct path"

Fixes: 979cac97 "firmware-imx: Move VPU and SDMA firmware files to the correct path"
Change-Id: Ic380889dbbba673311fce93263ea402f81c5c871
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 94992caa5f36823f881429d975240ab10efbfdff)
---

diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.8.bb b/recipes-bsp/firmware-imx/firmware-imx_8.8.bb
index 79c0c272..f8a6c491 100644
--- 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/sdma
-    install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/sdma
+    install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma
+    install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
 
     # EASRC Firmware section
     install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc
@@ -83,7 +83,7 @@ python populate_packages_prepend() {
                       extra_depends='',
                       prepend=True)
 
-    sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/sdma', d)
+    sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/sdma', d)
     do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
                       output_pattern='firmware-imx-sdma-%s',
                       description='Freescale IMX SDMA Firmware [%s]',