3 files changed, 18 insertions, 11 deletions

diff --git a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
index c1fb5665..f8dc1baa 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -1,13 +1,13 @@
 require common-csl-ip.inc
 
+PR = "${INC_PR}.0"
+
 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-staging.inc
 
-PR = "r1"
-
 DEPENDS = "ti-xdctools ti-cgt6x-native ti-sysbios"
 
-S = "${WORKDIR}/ti/csl"
+CSL_GIT_DESTSUFFIX = "git/ti/csl"
 
 export C6X_GEN_INSTALL_PATH="${STAGING_DIR_NATIVE}/usr"
 export XDCCGROOT="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
diff --git a/recipes-bsp/common-csl-ip/common-csl-ip.inc b/recipes-bsp/common-csl-ip/common-csl-ip.inc
index 63551658..74abab0c 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip.inc
+++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc
@@ -5,13 +5,22 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
 COMPATIBLE_MACHINE = "keystone|dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-BRANCH="master"
-BRANCH_dra7xx = "releases/PROCESSOR-SDK.01.00.00"
+INC_PR = "r4"
 
-SRC_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git;protocol=git;branch=${BRANCH};destsuffix=${S}"
+CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
+CSL_GIT_PROTOCOL ="git"
+CSL_GIT_BRANCH = "master"
+CSL_GIT_BRANCH_dra7xx = "releases/PROCESSOR-SDK.01.00.00"
+CSL_GIT_DESTSUFFIX = "git"
 
 # commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.01.00A
-SRCREV = "17bb083f0d5ed4ad6f38c991210a6a8e9aaf9c56"
+CSL_SRCREV = "17bb083f0d5ed4ad6f38c991210a6a8e9aaf9c56"
 
 # commit ID corresponds to PROCESSOR-SDK-ALPHA-1
-SRCREV_dra7xx = "37c5311ddf289f83b1432a9422816722d264bf55"
+CSL_SRCREV_dra7xx = "37c5311ddf289f83b1432a9422816722d264bf55"
+
+BRANCH="${CSL_GIT_BRANCH}"
+SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"
+SRCREV = "${CSL_SRCREV}"
+
+S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}"
diff --git a/recipes-bsp/common-csl-ip/common-csl-ip_git.bb b/recipes-bsp/common-csl-ip/common-csl-ip_git.bb
index 8f622a5e..77f78589 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip_git.bb
@@ -1,11 +1,9 @@
 require common-csl-ip.inc
 
-PR = "r3"
+PR = "${INC_PR}.0"
 
 ALLOW_EMPTY_${PN} = "1"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     install -d ${D}${includedir}/ti/csl
     find . -name "*.h" -type f | xargs -I {} cp --parents {} ${D}${includedir}/ti/csl