3 files changed, 14 insertions, 62 deletions

diff --git a/recipes-bsp/hyplnk-lld/files/init_hyplnk.sh b/recipes-bsp/hyplnk-lld/files/init_hyplnk.sh
deleted file mode 100755
index d6795f16..00000000
--- a/recipes-bsp/hyplnk-lld/files/init_hyplnk.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#*
-#* 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 libhyplnk_k2h.so.1.0.0 libhyplnk_device.so.1
-        ;;
-        *k2e*)
-                device=k2e
-                ln -sf libhyplnk_k2e.so.1.0.0 libhyplnk_device.so.1
-        ;;
-        *)
-                device=unknown
-        ;;
-esac
-
-if [ $device != unknown ]; then
-        ln -sf libhyplnk_device.so.1 libhyplnk_device.so
-        echo hyplnk library link established for device : $device
-fi
diff --git a/recipes-bsp/hyplnk-lld/hyplnk-lld.inc b/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
index 09fec453..ecd68e9c 100644
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld.inc
@@ -1,7 +1,8 @@
 DESCRIPTION = "TI Hyperlink Low Level Driver"
 LICENSE = "BSD-3-Clause"
 
-COMPATIBLE_MACHINE = "keystone"
+COMPATIBLE_MACHINE = "k2hk-evm|k2e-evm"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 LLDNAME="hyplnk"
 
@@ -22,9 +23,7 @@ SRCREV = "${HYPLNK_SRCREV}"
 PV = "2.1.0.5"
 INC_PR = "r2"
 
-DEVICELIST = " k2h \
-               k2k \
-               k2e \
-"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2e-evm  = "k2e"
 
 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 e20ad1f0..8ef3c823 100644
--- a/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
+++ b/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb
@@ -1,16 +1,9 @@
 include hyplnk-lld.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEPENDS = "common-csl-ip"
 
-SRC_URI += "file://init_hyplnk.sh"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "init_hyplnk.sh"
-INITSCRIPT_PARAMS = "defaults 10"
-
 do_compile () {
         make -f makefile_armv7 clean PDK_INSTALL_PATH="${STAGING_INCDIR}" \
                 HYPLNK_SRC_DIR="${S}"
@@ -25,12 +18,15 @@ do_install () {
         make -f makefile_armv7 install PDK_INSTALL_PATH="${STAGING_INCDIR}" \
                 INSTALL_INC_BASE_DIR="${D}/${includedir}" \
                 INSTALL_LIB_BASE_DIR="${D}${libdir}" HYPLNK_SRC_DIR="${S}"
-#   Set the generic device library symbolic link to default k2h
+
+        # Set the generic device library symbolic link to default k2h
         cd ${D}${libdir}
-        ln -sf libhyplnk_k2h.so.1.0.0 libhyplnk_device.so.1
-        ln -sf libhyplnk_device.so.1 libhyplnk_device.so
-#   Copy init scripts
-        install -d ${D}${sysconfdir}/init.d/
-        install -c -m 755 ${WORKDIR}/init_hyplnk.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 
+        # Link only the first device in the list
+        for device in ${DEVICELIST}
+        do
+                ln -sf libhyplnk_${device}.so.1.0.0 libhyplnk_device.so.1
+                break
+        done
+        ln -sf libhyplnk_device.so.1 libhyplnk_device.so
 }