firmware-imx: Move specific files

The 11.09.01 has some specific files and those ought to be in the
version recipe.

Change-Id: I6749648927a122b8652323321757844618660b67
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx51.bin
similarity index 100%
rename from meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin
rename to meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx51.bin

diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx53.bin
similarity index 100%
rename from meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin
rename to meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx53.bin

diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
index 0bdf924bd86a75193d4cf8c3388caad4fd4991fd..cee34bcbf530fa9d697a03239ed42d6473d08f8f 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -4,27 +4,18 @@ SECTION = "base"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://licenses/vpu/EULA;md5=6469a8514eed615d6bf8c09f41846d8f"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
-SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
-           file://vpu_fw_imx51.bin \
-           file://vpu_fw_imx53.bin"
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
 
 inherit fsl-eula-unpack
 
-COMPATIBLE_MACHINE = "(mx5)"
-
 # todo: make FILES_ machine dependent using override, i.MX53 only now.
 FILES_${PN} = "/lib/firmware/vpu/vpu_fw_imx53.bin"
 FILES_${PN} += "/lib/firmware/sdma/sdma-imx53-to1.bin"
 FILES_${PN} += "/lib/firmware/ath6k/*"
 FILES_${PN} += "/lib/firmware/ar3k/*"
 
-do_patch() {
-       cp ${WORKDIR}/vpu_fw_imx51.bin ${S}/firmware/vpu/
-       cp ${WORKDIR}/vpu_fw_imx53.bin ${S}/firmware/vpu/
-}
-
 do_install() {
        install -d ${D}/lib/firmware/vpu
        install -m 0755 ${S}/firmware/vpu/vpu_fw_imx53.bin ${D}/lib/firmware/vpu

diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb
index e2dcc02fd5825ab43275fc5182d77730c5856023..f7d7c6e0635b280a8057007682f2350ac8a7ba8e 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb
@@ -1,8 +1,16 @@
 require firmware-imx.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
+
+SRC_URI += "file://vpu_fw_imx51.bin \
+            file://vpu_fw_imx53.bin"
 
 SRC_URI[md5sum] = "64c77a0f061fe7e628d26fda3c5c7f5a"
 SRC_URI[sha256sum] = "072e9b712db691a799182d29473d5b7ed9dc9d095a6d0053ef42a84db7709a42"
 
+do_patch() {
+       cp ${WORKDIR}/vpu_fw_imx51.bin ${S}/firmware/vpu/
+       cp ${WORKDIR}/vpu_fw_imx53.bin ${S}/firmware/vpu/
+}
+
 COMPATIBLE_MACHINE = "(mx5)"