diff --git a/recipes-bsp/hyplnk-lld/hyplnk-lld-test_git.bb b/recipes-bsp/hyplnk-lld/hyplnk-lld-test_git.bb
index c33e2dfe..31b69c26 100644
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld-test_git.bb
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld-test_git.bb
@@ -1,5 +1,7 @@
 include hyplnk-lld.inc
 
+PR = "${INC_PR}.0"
+
 DEPENDS = "common-csl-ip hyplnk-lld"
 
 do_compile () {
diff --git a/recipes-bsp/hyplnk-lld/hyplnk-lld.inc b/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
index 70b5d80a..09fec453 100644
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
@@ -5,21 +5,26 @@ COMPATIBLE_MACHINE = "keystone"
 
 LLDNAME="hyplnk"
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/${LLDNAME}/COPYING.txt;md5=623325cc19e613a4e770fbb749922592"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}/COPYING.txt;md5=623325cc19e613a4e770fbb749922592"
+
+HYPLNK_GIT_URI = "git://git.ti.com/keystone-rtos/hyplnk-lld.git"
+HYPLNK_GIT_PROTOCOL = "git"
+HYPLNK_GIT_BRANCH = "master"
+HYPLNK_GIT_DESTSUFFIX = "git/ti/drv/${LLDNAME}"
 
-BRANCH="master"
-SRC_URI = "git://git.ti.com/keystone-rtos/hyplnk-lld.git;destsuffix=git/ti/drv/${LLDNAME};protocol=git;branch=${BRANCH}"
-FILESPATH_prepend := "${THISDIR}/files"
 # Following commit corresponds to tag DEV.HYPLNK_LLD.02.01.00.05
-SRCREV = "ea2a634578626deaa69608a189d5d7e84e5b7127"
+HYPLNK_SRCREV = "ea2a634578626deaa69608a189d5d7e84e5b7127"
+
+BRANCH="${HYPLNK_GIT_BRANCH}"
+SRC_URI = "${HYPLNK_GIT_URI};destsuffix=${HYPLNK_GIT_DESTSUFFIX};protocol=${HYPLNK_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${HYPLNK_SRCREV}"
 
 PV = "2.1.0.5"
-PR = "r1"
+INC_PR = "r2"
 
 DEVICELIST = " k2h \
                k2k \
                k2e \
 "
 
-BASEDIR = "${WORKDIR}/git"
-S = "${BASEDIR}/ti/drv/${LLDNAME}"
+S = "${WORKDIR}/${HYPLNK_GIT_DESTSUFFIX}"
diff --git a/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb b/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
index 8be072ca..e20ad1f0 100644
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
@@ -1,5 +1,7 @@
 include hyplnk-lld.inc
 
+PR = "${INC_PR}.0"
+
 DEPENDS = "common-csl-ip"
 
 SRC_URI += "file://init_hyplnk.sh"