From e9e9109a2544545c3ac3456ec18227d96e56a70f Mon Sep 17 00:00:00 2001
From: Jun Zhu <junzhu@nxp.com>
Date: Fri, 13 Oct 2017 00:15:42 +0800
Subject: [PATCH] imx-lib: Add git recipe

- As the imx-lib git repository is public as git.freescale.com/imx/imx-lib.git,
build it from the git.
- Add support to i.MX 6SLL and 7ULP.
- Set PV as 5.8+${SRCPV}

Add the options to support i.MX 6SLL and 7ULP

Signed-off-by: Jun Zhu <junzhu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-lib/imx-lib_5.4.bb            | 10 -------
 .../imx-lib/{imx-lib.inc => imx-lib_git.bb}   | 26 +++++++++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-bsp/imx-lib/imx-lib_5.4.bb
 rename recipes-bsp/imx-lib/{imx-lib.inc => imx-lib_git.bb} (64%)

diff --git a/recipes-bsp/imx-lib/imx-lib_5.4.bb b/recipes-bsp/imx-lib/imx-lib_5.4.bb
deleted file mode 100644
index 3055c51a..00000000
--- a/recipes-bsp/imx-lib/imx-lib_5.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-
-include imx-lib.inc
-
-PE = "1"
-
-SRC_URI[md5sum] = "a0da6a01698776f2df05130108c226c9"
-SRC_URI[sha256sum] = "8d12c4a0a44d29569f1ead3a36adc28402b9c4036b53e11dd3ebf2295e3ce1d0"
-
-COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-bsp/imx-lib/imx-lib.inc b/recipes-bsp/imx-lib/imx-lib_git.bb
similarity index 64%
rename from recipes-bsp/imx-lib/imx-lib.inc
rename to recipes-bsp/imx-lib/imx-lib_git.bb
index 0b21d942..d48ff5a5 100644
--- a/recipes-bsp/imx-lib/imx-lib.inc
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -1,5 +1,6 @@
-# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2016 Freescale Semiconductor
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
+# Copyright 2017 NXP
 
 DESCRIPTION = "Platform specific libraries for imx platform"
 LICENSE = "LGPLv2.1"
@@ -8,26 +9,35 @@ DEPENDS = "virtual/kernel"
 
 LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 
+PE = "1"
+
+PV = "5.8+${SRCPV}"
+
+SRCBRANCH = "imx_4.9.11_1.0.0_ga"
+SRC_URI = "git://git.freescale.com/imx/imx-lib.git;protocol=git;branch=${SRCBRANCH}"
+SRCREV = "f5f14fc24581e5d6e689f42a56b5f2992f978ef4"
+
+S = "${WORKDIR}/git"
+
 PLATFORM_mx6q  = "IMX6Q"
 PLATFORM_mx6dl = "IMX6Q"
 PLATFORM_mx6sl = "IMX6S"
+PLATFORM_mx6sll = "IMX6UL"
 PLATFORM_mx6sx = "IMX6S"
-PLATFORM_mx7d  = "IMX7"
 PLATFORM_mx6ul = "IMX6UL"
+PLATFORM_mx7d  = "IMX7"
+PLATFORM_mx7ulp = "IMX7"
 
 PARALLEL_MAKE="-j 1"
 EXTRA_OEMAKE = ""
 
-SRC_URI = "${FSL_MIRROR}/imx-lib-${PV}.tar.gz"
-
 do_compile () {
-    INCLUDE_DIR="-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"
-
+    INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"
     oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all
 }
 
 do_install () {
     oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install
 }
+
+COMPATIBLE_MACHINE = "(mx6|mx7)"
-- 
2.40.1