From: Leon Woestenberg <leon@sidebranch.com>
Date: Fri, 6 Jan 2012 16:52:15 +0000 (+0100)
Subject: imx-firmware: Merge patches from Linux_20201112_20patch_bundle.tar.gz
X-Git-Tag: 2.1~1941^2~3
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6165d238a04b160c19eba0731a48137b9520c645;p=meta-freescale.git

imx-firmware: Merge patches from Linux_20201112_20patch_bundle.tar.gz

Fixed issue: [Decode/H.264] VPU output has mosaics for one clip
Upgrade VPU f/w to v1.4.49 on mx51
Upgrade VPU f/w to v1.4.48 on mx53

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---

diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/firmware-imx-11.09.01.tar.gz b/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/firmware-imx-11.09.01.tar.gz
old mode 100755
new mode 100644
diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx51.bin b/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx51.bin
new file mode 100644
index 00000000..9a2dcf5f
Binary files /dev/null and b/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx51.bin differ
diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx53.bin b/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx53.bin
new file mode 100644
index 00000000..b9d70f72
Binary files /dev/null and b/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware/vpu_fw_imx53.bin differ
diff --git a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware_0.1.bb b/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware_0.1.bb
index a4766932..54a5e1ab 100644
--- a/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware_0.1.bb
+++ b/meta-fsl-arm/recipes-bsp/imx-firmware/imx-firmware_0.1.bb
@@ -3,9 +3,11 @@ DESCRIPTION = "Freescale IMX firmware such as for the VPU"
 SECTION = "base"
 LICENSE = "Freescale"
 LIC_FILES_CHKSUM = "file://licenses/vpu/EULA;md5=6469a8514eed615d6bf8c09f41846d8f"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "file://firmware-imx-11.09.01.tar.gz"
+SRC_URI = "file://firmware-imx-11.09.01.tar.gz \
+           file://vpu_fw_imx51.bin \
+           file://vpu_fw_imx53.bin"
 
 COMPATIBLE_MACHINE = "(imx53ard|imx53qsb)"
 
@@ -15,6 +17,11 @@ S = "${WORKDIR}/firmware-imx-11.09.01"
 FILES_${PN} = "/lib/firmware/vpu/vpu_fw_imx53.bin"
 FILES_${PN} += "/lib/firmware/sdma/sdma-imx53-to1.bin"
 
+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