firmware-imx: Upgrade to 3.10.31-1.1.0 Beta version

VPU firmware is updated to version v3.1.1_r46060 for mx6

This release does not contain Atheros firmware so remove from the
firmware-imx.inc file. This also removes the 3.0.35-4.0.0 version as
this release is also compatible with mx5 SoCs.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

4 files changed, 15 insertions, 24 deletions

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 0f49937e8..96ff1b070 100644
--- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -11,17 +11,12 @@ SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
 inherit fsl-eula-unpack
 
 do_install() {
-        install -d ${D}/lib/firmware
+    install -d ${D}/lib/firmware
     cp -rfv firmware/* ${D}/lib/firmware/
     find ${D}/lib/firmware -type f -exec chmod 644 '{}' ';'
 
     # Remove files not going to be installed
     find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';'
-    rm ${D}/lib/firmware/LICENCE.atheros_firmware \
-       ${D}/lib/firmware/README
-
-    # FIXME: Remove firmware packaged in linux-firmware
-    rm -r ${D}/lib/firmware/ath6k ${D}/lib/firmware/ar3k
 }
 
 python populate_packages_prepend() {
diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb
deleted file mode 100644
index d82aac860..000000000
--- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.0.35-4.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require firmware-imx.inc
-
-PR = "r5.0"
-
-SRC_URI[md5sum] = "f23ce8437e141c1d20e3bf175eb3af7f"
-SRC_URI[sha256sum] = "5aaf5e91dbec8072fec613218c0fc939d9a59e74df53054f49ab31f1f0dd25d9"
-
-COMPATIBLE_MACHINE = "(mx5|mx6)"
diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb
deleted file mode 100644
index 0e95d0260..000000000
--- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.10.17-1.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2012-2014 Freescale Semiconductor
-
-require recipes-bsp/firmware-imx/firmware-imx.inc
-
-PE="1"
-
-SRC_URI[md5sum] = "29a54f6e5bf889a00cd8ca85080af223"
-SRC_URI[sha256sum] = "768d857dfc1bec344fbd95665e450030d5a0d541a695027f6d7815e0309bea37"
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb
new file mode 100644
index 000000000..133108d5a
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx_3.10.31-1.1.0.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2012-2014 Freescale Semiconductor
+
+require firmware-imx.inc
+
+PE="1"
+
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}-beta.bin;fsl-eula=true"
+
+S = "${WORKDIR}/firmware-imx-${PV}-beta"
+
+SRC_URI[md5sum] = "4e102affc4273f424da4cec9f46adae8"
+SRC_URI[sha256sum] = "8fcfc713321c4ffaafee248feb392b7bc9b913b7abee5020fceaca1d1a49ac99"
+
+COMPATIBLE_MACHINE = "(mx5|mx6)"