From a892deb197318003ce325a34bc9e9729cf88f36f Mon Sep 17 00:00:00 2001
From: Jacob Stiffler <j-stiffler@ti.com>
Date: Wed, 4 Nov 2015 01:47:17 +0000
Subject: [PATCH] iqn2-lld: Clean up recipes

* Use INC_PR to track recipe revisions
* Define variables for GIT SRC_URI parameters

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-bsp/iqn2-lld/iqn2-lld-test_git.bb |  2 ++
 recipes-bsp/iqn2-lld/iqn2-lld.inc         | 16 ++++++++++++----
 recipes-bsp/iqn2-lld/iqn2-lld_git.bb      |  2 ++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/iqn2-lld/iqn2-lld-test_git.bb b/recipes-bsp/iqn2-lld/iqn2-lld-test_git.bb
index f1aa9e4a..f276c4b3 100644
--- a/recipes-bsp/iqn2-lld/iqn2-lld-test_git.bb
+++ b/recipes-bsp/iqn2-lld/iqn2-lld-test_git.bb
@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip iqn2-lld dfe-lld"
 
 include iqn2-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} IQN2_SRC_DIR=${WORKDIR}/git"
 
 do_compile () {
diff --git a/recipes-bsp/iqn2-lld/iqn2-lld.inc b/recipes-bsp/iqn2-lld/iqn2-lld.inc
index 812d3f61..4a43a266 100644
--- a/recipes-bsp/iqn2-lld/iqn2-lld.inc
+++ b/recipes-bsp/iqn2-lld/iqn2-lld.inc
@@ -1,13 +1,21 @@
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
 LICENSE = "BSD-3-Clause"
 
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/keystone-rtos/iqn2-lld.git;destsuffix=git/ti/drv/iqn2;protocol=git;branch=${BRANCH}"
+IQN2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/iqn2-lld.git"
+IQN2_LLD_GIT_PROTOCOL = "git"
+IQN2_LLD_GIT_BRANCH = "master"
+IQN2_LLD_GIT_DESTSUFFIX = "git/ti/drv/iqn2"
+
 # Following commit corresponds to DEV.IQN_LLD.01.00.00.08F
-SRCREV = "29d5358b944f1447c024263f86e8c71784440b99"
+IQN2_LLD_SRCREV = "29d5358b944f1447c024263f86e8c71784440b99"
+
+BRANCH = "${IQN2_LLD_GIT_BRANCH}"
+SRC_URI = "${IQN2_LLD_GIT_URI};destsuffix=${IQN2_LLD_GIT_DESTSUFFIX};protocol=${IQN2_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${IQN2_LLD_SRCREV}"
 
 PV = "1.0.0.8"
+INC_PR = "r1"
 
 COMPATIBLE_MACHINE = "k2l-evm"
 
-S = "${WORKDIR}/git/ti/drv/iqn2"
+S = "${WORKDIR}/${IQN2_LLD_GIT_DESTSUFFIX}"
diff --git a/recipes-bsp/iqn2-lld/iqn2-lld_git.bb b/recipes-bsp/iqn2-lld/iqn2-lld_git.bb
index 19ffc053..4e681169 100644
--- a/recipes-bsp/iqn2-lld/iqn2-lld_git.bb
+++ b/recipes-bsp/iqn2-lld/iqn2-lld_git.bb
@@ -4,6 +4,8 @@ DEPENDS = "common-csl-ip"
 
 include iqn2-lld.inc
 
+PR = "${INC_PR}.0"
+
 EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR}"
 
 do_compile () {