From eecb38d06e9e9314730dfcc007bcad6c50c997c8 Mon Sep 17 00:00:00 2001
From: Lauren Post <lauren.post@freescale.com>
Date: Mon, 16 Dec 2013 11:05:12 -0600
Subject: [PATCH] imx-vpu: Upgrade to 3.10.17-1.0.0_beta

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...uild-Allow-CC-and-AR-to-be-overriden.patch | 33 -------------------
 .../imx-vpu/imx-vpu_3.10.17-1.0.0.bb          | 14 ++++++++
 .../imx-vpu/imx-vpu_3.10.9-1.0.0.bb           | 11 -------
 3 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.9-1.0.0/build-Allow-CC-and-AR-to-be-overriden.patch
 create mode 100644 meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
 delete mode 100644 meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.9-1.0.0.bb

diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.9-1.0.0/build-Allow-CC-and-AR-to-be-overriden.patch b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.9-1.0.0/build-Allow-CC-and-AR-to-be-overriden.patch
deleted file mode 100644
index 1a014aa9..00000000
--- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu-3.10.9-1.0.0/build-Allow-CC-and-AR-to-be-overriden.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 97cb0b711ce1a9d0dd3de51480d2e3a1399ce34c Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Tue, 5 Nov 2013 15:20:15 -0200
-Subject: [PATCH] build: Allow CC and AR to be overriden
-Organization: O.S. Systems Software LTDA.
-
-This is need to allow proper building when using Yocto and multiple
-machines sharing sstate-cache, otherwise the toolchain is going to
-default to use the first build machine sysroot due lack of '-sysroot'
-option.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- vpu/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vpu/Makefile b/vpu/Makefile
-index b106631..dec2429 100644
---- a/vpu/Makefile
-+++ b/vpu/Makefile
-@@ -1,5 +1,5 @@
--CC=$(CROSS_COMPILE)gcc
--AR=$(CROSS_COMPILE)ar
-+CC ?= $(CROSS_COMPILE)gcc
-+AR ?= $(CROSS_COMPILE)ar
- 
- # list of platforms which want this test case
- INCLUDE_LIST:= IMX27ADS IMX51 IMX53 IMX6Q
--- 
-1.8.4.rc3
-
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
new file mode 100644
index 00000000..fe8c5a64
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.17-1.0.0.bb
@@ -0,0 +1,14 @@
+# 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[md5sum] = "7ba78483bd1cf61bb6fce4ed9e9287d6"
+SRC_URI[sha256sum] = "589500bcc1c871d688ec23f11b930cd49079a689ed85d974ee8b32540c601cdd"
+
+COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.9-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.9-1.0.0.bb
deleted file mode 100644
index c4705c76..00000000
--- a/meta-fsl-arm/recipes-bsp/imx-vpu/imx-vpu_3.10.9-1.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-require imx-vpu.inc
-
-PE = "1"
-
-SRC_URI += "file://build-Allow-CC-and-AR-to-be-overriden.patch"
-
-SRC_URI[md5sum] = "61331c9ed2d4c1b3aeab9c35fd034ac3"
-SRC_URI[sha256sum] = "5dd86a26c8d3013e0d78308b1ccd8815730818e465787f55013b492d2d3c7710"
-
-COMPATIBLE_MACHINE = "(mx6)"
-- 
2.40.1