diff --git a/recipes-bsp/cppi-lld/cppi-lld.inc b/recipes-bsp/cppi-lld/cppi-lld.inc
index d26adc59..0a8ee55f 100644
--- a/recipes-bsp/cppi-lld/cppi-lld.inc
+++ b/recipes-bsp/cppi-lld/cppi-lld.inc
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acd
 BRANCH = "master"
 SRC_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git;destsuffix=git/ti/drv/cppi;protocol=git;branch=${BRANCH}"
 
-# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.06"
-SRCREV = "4c6c0a857786c49d8003453d3bc7c3c97ff4f5a4"
-PV = "02.01.00.06"
-PR = "r0"
+# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.08"
+SRCREV = "320af092dc382af52b9e68f14ca8acd5c1c467c1"
+PV = "02.01.00.09"
+PR = "r1"
 
 DEVICELIST = "k2h k2k k2l k2e"
 
diff --git a/recipes-bsp/cppi-lld/cppi-lld_git.bb b/recipes-bsp/cppi-lld/cppi-lld_git.bb
index bb2028b5..cd419f6a 100755
--- a/recipes-bsp/cppi-lld/cppi-lld_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld_git.bb
@@ -5,15 +5,29 @@ DEPENDS = "common-csl-ip rm-lld qmss-lld"
 
 include cppi-lld.inc
 
+SRC_URI += "file://init_cppi.sh"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "init_cppi.sh"
+INITSCRIPT_PARAMS = "defaults 10"
+
 do_compile () {
 #   Now build the lld in the updated directory
 	make -f makefile_armv7 clean PDK_INSTALL_PATH=${STAGING_INCDIR}
 	for device in ${DEVICELIST}
 	do
-		make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR}  DEVICE="${device}" 
+		make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR}  DEVICE="${device}"
 	done
 }
 
 do_install () {
 	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
+#   Set the generic device library symbolic link to default k2h
+    cd ${D}${libdir}
+    ln -sf libcppi_k2h.so.1.0.0 libcppi_device.so.1
+    ln -sf libcppi_device.so.1 libcppi_device.so
+#   Copy init scripts
+    install -d ${D}${sysconfdir}/init.d/
+    install -c -m 755 ${WORKDIR}/init_cppi.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }
diff --git a/recipes-bsp/cppi-lld/files/init_cppi.sh b/recipes-bsp/cppi-lld/files/init_cppi.sh
new file mode 100755
index 00000000..7a602dab
--- /dev/null
+++ b/recipes-bsp/cppi-lld/files/init_cppi.sh
@@ -0,0 +1,47 @@
+#*
+#* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+#*
+#*
+#*  Redistribution and use in source and binary forms, with or without
+#*  modification, are permitted provided that the following conditions
+#*  are met:
+#*
+#*    Redistributions of source code must retain the above copyright
+#*    notice, this list of conditions and the following disclaimer.
+#*
+#*    Redistributions in binary form must reproduce the above copyright
+#*    notice, this list of conditions and the following disclaimer in the
+#*    documentation and/or other materials provided with the
+#*    distribution.
+#*
+#*    Neither the name of Texas Instruments Incorporated nor the names of
+#*    its contributors may be used to endorse or promote products derived
+#*    from this software without specific prior written permission.
+#*
+
+#! /bin/sh
+compatible=$(cat /proc/device-tree/compatible)
+
+cd /usr/lib
+case "$compatible" in
+	*k2hk*)
+		device=k2hk
+		ln -sf libcppi_k2h.so.1.0.0 libcppi_device.so.1
+	;;
+	*k2l*)
+		device=k2l
+		ln -sf libcppi_k2l.so.1.0.0 libcppi_device.so.1
+	;;
+	*k2e*)
+	device=k2e
+		ln -sf libcppi_k2e.so.1.0.0 libcppi_device.so.1
+	;;
+	*)
+		device=unknown
+	;;
+esac
+
+if [ $device != unknown ]; then
+	ln -sf libcppi_device.so.1 libcppi_device.so
+	echo cppi library link established for device : $device
+fi