From 886ffe63d354610508f2d1430f2f898991aefab2 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 8 Oct 2012 05:17:43 -0300
Subject: 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>
---
 .../firmware-imx-11.09.01/vpu_fw_imx51.bin             | Bin 0 -> 147472 bytes
 .../firmware-imx-11.09.01/vpu_fw_imx53.bin             | Bin 0 -> 147472 bytes
 recipes-bsp/firmware-imx/firmware-imx.inc              |  13 ++-----------
 recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin | Bin 147472 -> 0 bytes
 recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin | Bin 147472 -> 0 bytes
 recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb      |  10 +++++++++-
 6 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx51.bin
 create mode 100644 recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx53.bin
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin
 delete mode 100644 recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin

diff --git a/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx51.bin b/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx51.bin
new file mode 100644
index 0000000..9a2dcf5
Binary files /dev/null and b/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx51.bin differ
diff --git a/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx53.bin b/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx53.bin
new file mode 100644
index 0000000..b9d70f7
Binary files /dev/null and b/recipes-bsp/firmware-imx/firmware-imx-11.09.01/vpu_fw_imx53.bin differ
diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 0bdf924..cee34bc 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/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/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin b/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin
deleted file mode 100644
index 9a2dcf5..0000000
Binary files a/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx51.bin and /dev/null differ
diff --git a/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin b/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin
deleted file mode 100644
index b9d70f7..0000000
Binary files a/recipes-bsp/firmware-imx/firmware-imx/vpu_fw_imx53.bin and /dev/null differ
diff --git a/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb b/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb
index e2dcc02..f7d7c6e 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_11.09.01.bb
+++ b/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)"
-- 
cgit v1.2.3-54-g00ecf