4 files changed, 16 insertions, 98 deletions

diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.17-1.0.0/obey-variables.patch b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.31-1.1.0/obey-variables.patch
index 7071e9ecd..7071e9ecd 100644
--- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.17-1.0.0/obey-variables.patch
+++ b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.31-1.1.0/obey-variables.patch
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch
deleted file mode 100644
index 348a5360d..000000000
--- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu/0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 3f3e374391ddc5e605f604e5bcdf95e29b1bcc39 Mon Sep 17 00:00:00 2001
-From: Eric Nelson <eric.nelson@boundarydevices.com>
-Date: Fri, 20 Jun 2014 19:42:38 -0700
-Subject: [PATCH] IOGetVirtMem returns -1 (MAP_FAILED) on failure
-
-Upstream-Status: Pending
-
-Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
----
- vpu/vpu_io.c  | 2 +-
- vpu/vpu_io.h  | 2 ++
- vpu/vpu_lib.c | 8 ++++----
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c
-index 8cbb571..14759da 100644
---- a/vpu/vpu_io.c
-+++ b/vpu/vpu_io.c
-@@ -265,7 +265,7 @@ int IOSystemInit(void *callback)
-                goto err;
-        }
- 
--       if (IOGetVirtMem(&bit_work_addr) <= 0)
-+       if (IOGetVirtMem(&bit_work_addr) == -1)
-                goto err;
- #endif
-        UnlockVpu(vpu_semap);
-diff --git a/vpu/vpu_io.h b/vpu/vpu_io.h
-index 392e04a..1e6340d 100644
---- a/vpu/vpu_io.h
-+++ b/vpu/vpu_io.h
-@@ -64,6 +64,8 @@ int IOSystemInit(void *callback);
- int IOSystemShutdown(void);
- int IOGetPhyMem(vpu_mem_desc * buff);
- int IOFreePhyMem(vpu_mem_desc * buff);
-+
-+/* returns -1 ((int)MAP_FAILED) on failure */
- int IOGetVirtMem(vpu_mem_desc * buff);
- int IOFreeVirtMem(vpu_mem_desc * buff);
- int IOGetVShareMem(int size);
-diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
-index 1fb731b..7a7f42d 100644
---- a/vpu/vpu_lib.c
-+++ b/vpu/vpu_lib.c
-@@ -1764,7 +1764,7 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
-                                err_msg("Unable to obtain physical mem\n");
-                                return RETCODE_FAILURE;
-                        }
--                       if (IOGetVirtMem(&pEncInfo->picParaBaseMem) <= 0) {
-+                       if (IOGetVirtMem(&pEncInfo->picParaBaseMem) == -1) {
-                                IOFreePhyMem(&pEncInfo->picParaBaseMem);
-                                pEncInfo->picParaBaseMem.phy_addr = 0;
-                                err_msg("Unable to obtain virtual mem\n");
-@@ -2982,7 +2982,7 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info)
-                        UnlockVpu(vpu_semap);
-                        return RETCODE_FAILURE;
-                }
--               if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+               if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
-                        IOFreePhyMem(&pDecInfo->userDataBufMem);
-                        pDecInfo->userDataBufMem.phy_addr = 0;
-                        err_msg("Unable to obtain virtual mem\n");
-@@ -4017,7 +4017,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
-                                UnlockVpu(vpu_semap);
-                                return RETCODE_FAILURE;
-                        }
--                       if (IOGetVirtMem(&pDecInfo->picParaBaseMem) <= 0) {
-+                       if (IOGetVirtMem(&pDecInfo->picParaBaseMem) == -1) {
-                                IOFreePhyMem(&pDecInfo->picParaBaseMem);
-                                pDecInfo->picParaBaseMem.phy_addr = 0;
-                                err_msg("Unable to obtain virtual mem\n");
-@@ -4057,7 +4057,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
-                        UnlockVpu(vpu_semap);
-                        return RETCODE_FAILURE;
-                }
--               if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+               if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
-                        IOFreePhyMem(&pDecInfo->userDataBufMem);
-                        pDecInfo->userDataBufMem.phy_addr = 0;
-                        err_msg("Unable to obtain virtual mem\n");
--- 
-1.9.1
-
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
deleted file mode 100644
index 6ef79e555..000000000
--- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2013, 2014 Freescale Semiconductor
-
-require imx-vpu.inc
-
-PE = "1"
-
-SRC_URI += "\
-    file://0001-IOGetVirtMem-returns-1-MAP_FAILED-on-failure.patch \
-    file://obey-variables.patch \
-"
-SRC_URI[md5sum] = "71ea1b803864101ebf88a1bab45514d2"
-SRC_URI[sha256sum] = "cd8a7bd50ff3274db76a331cc6622d3ba4bb7c790ce778f303e49187df2dfd72"
-
-
-COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb
new file mode 100644
index 000000000..85ada4954
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.31-1.1.0.bb
@@ -0,0 +1,16 @@
+# Copyright (C) 2013, 2014 Freescale Semiconductor
+
+require imx-vpu.inc
+
+PE = "1"
+
+# FIXME: Drop 'beta' suffix for GA release
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.bin;fsl-eula=true"
+S = "${WORKDIR}/${PN}-${PV}-beta"
+
+SRC_URI += "file://obey-variables.patch"
+
+SRC_URI[md5sum] = "ab76e7395b6a178a8538a6d5beb87656"
+SRC_URI[sha256sum] = "22d0542bd4d7beb88084575c834bf9045c8e2acc43acdd2ec4e0e5534b4b9c5e"
+
+COMPATIBLE_MACHINE = "(mx6)"