From: Lauren Post <lauren.post@freescale.com>
Date: Tue, 1 Oct 2013 16:38:21 +0000 (-0500)
Subject: imx-lib: Upgrade to 3.10.9-1.0.0
X-Git-Tag: 2.1~1154
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1c375165d2525d3460cb63ad9e7fd5bd9f855fb2;p=meta-freescale.git

imx-lib: Upgrade to 3.10.9-1.0.0

This includes following main changes:

- imx-lib requires uapi header include for 3.10 kernel
- imx-lib no longer contains imx-vpu so all of imx-lib is LGPL
- libvpu is now in a separate component so eula-unpack inherit is not required

Also will not build libraries on mx6 only applicable to mx53

Previous kernels supported all the headers but 3.5.7 and 3.10.9
linux-imx do not inclue mx53 headers

Change-Id: Ia747ee6adf2c2e1a3425ae183ac9e3e0018c5a79
Signed-off-by: Lauren Post <lauren.post@freescale.com>
---

diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc
index 95ffb88f..f2e36d46 100644
--- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc
+++ b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib.inc
@@ -7,23 +7,19 @@ DEPENDS = "virtual/kernel"
 
 LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
 
-inherit fsl-eula-unpack
-
 PLATFORM_mx6 = "IMX6Q"
 PLATFORM_mx5 = "IMX51"
 
 PARALLEL_MAKE="-j 1"
 EXTRA_OEMAKE = ""
 
-do_configure_append () {
-    # FIXME: The build system does not allow CC and AR to be overriden
-    find ${S} -name Makefile | xargs sed -i 's,^\(CC\|AR\)=,\1 ?=,g'
-}
+SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
 
 do_compile () {
-    INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
-                 -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include \
-                 -I${STAGING_KERNEL_DIR}/include"
+    INCLUDE_DIR="-I${STAGING_INCDIR}/uapi -I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include \
+                 -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
+                 -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include"
+
     oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all
 }
 
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.9-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.9-1.0.0.bb
new file mode 100644
index 00000000..c3a7fb09
--- /dev/null
+++ b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.10.9-1.0.0.bb
@@ -0,0 +1,10 @@
+# Copyright (C) 2013 Freescale Semiconductor
+
+include imx-lib.inc
+
+SRC_URI[md5sum] = "5cc9c8d09c7ba401cdab4a2ecbda89e2"
+SRC_URI[sha256sum] = "d1581c2f2956731da0c42e9dc17514a4d00790deeb83defeb5e07d14746190d8"
+
+PE = "1"
+
+COMPATIBLE_MACHINE = "(mx6)"
\ No newline at end of file
diff --git a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb b/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb
deleted file mode 100644
index bfb19841..00000000
--- a/meta-fsl-arm/recipes-bsp/imx-lib/imx-lib_3.5.7-1.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-
-require imx-lib.inc
-
-PE = "1"
-
-SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "70248d0932a6d2808701166f41b1708f"
-SRC_URI[sha256sum] = "ad746e34cf7d8cd9cb3f3f6c8eda85d9fa314fc6f57502d1f9cb454c5fab2f9d"
-
-COMPATIBLE_MACHINE = "(mx6)"