ti recipes: DEPENDS/RDEPENDS ti-dsplink/ti-dsplink-module

    * We renamed ti-dsplink recipe, update dependent recipes
    * Remove variables from machine includes, cleanup ti-paths
    * lpm/dsplink variables moved into recipes
    * removed duplicates and commented variables

Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

6 files changed, 8 insertions, 38 deletions

diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc
index 3134d6b5f6..fc3433e2d0 100644
--- a/recipes/ti/ti-codec-engine.inc
+++ b/recipes/ti/ti-codec-engine.inc
@@ -5,10 +5,10 @@ require ti-paths.inc
 # compile time dependencies
 DEPENDS = "ti-framework-components ti-xdais ti-xdctools ti-cgt6x ti-biosutils ti-edma3lld ti-linuxutils"
 
-DEPENDS_append_dm6446 	= " ti-dspbios ti-dsplink-module"
-DEPENDS_append_dm6467 	= " ti-dspbios ti-dsplink-module"
-DEPENDS_append_omap3   	= " ti-dspbios ti-dsplink-module ti-lpm-module"
-DEPENDS_append_omapl138 = " ti-dspbios ti-dsplink-module"
+DEPENDS_append_dm6446 	= " ti-dspbios ti-dsplink ti-local-power-manager"
+DEPENDS_append_dm6467 	= " ti-dspbios ti-dsplink"
+DEPENDS_append_omap3   	= " ti-dspbios ti-dsplink ti-local-power-manager"
+DEPENDS_append_omapl138 = " ti-dspbios ti-dsplink"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV},lite.tar.gz;name=cetarball"
 
diff --git a/recipes/ti/ti-codecs-dm6467_1.0.0.3.bb b/recipes/ti/ti-codecs-dm6467_1.0.0.3.bb
index 21e8b6d02e..cef2616764 100644
--- a/recipes/ti/ti-codecs-dm6467_1.0.0.3.bb
+++ b/recipes/ti/ti-codecs-dm6467_1.0.0.3.bb
@@ -13,7 +13,7 @@ SRC_URI[dm6467codecs.sha256sum] = "ab9115477f52814f4f0e860f89ca56bfd9ed0e8b89a3c
 S = "${WORKDIR}/cs${CSVER}dm6467_${PV}"
 
 # compile time dependencies
-DEPENDS="ti-codec-engine ti-biosutils ti-dsplink-module"
+DEPENDS="ti-codec-engine ti-biosutils ti-dsplink"
 
 do_compile() {
 	make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
diff --git a/recipes/ti/ti-codecs-dm6467_1.0.0.bb b/recipes/ti/ti-codecs-dm6467_1.0.0.bb
index 219d02f670..9454b94ee4 100644
--- a/recipes/ti/ti-codecs-dm6467_1.0.0.bb
+++ b/recipes/ti/ti-codecs-dm6467_1.0.0.bb
@@ -13,7 +13,7 @@ SRC_URI[dm6467codecs.sha256sum] = "06f3efc4fbdb205884ece90ebc02c0caa536e86012b1d
 S = "${WORKDIR}/cs${CSVER}dm6467_${PV}"
 
 # compile time dependencies
-DEPENDS="ti-codec-engine ti-biosutils ti-dsplink-module"
+DEPENDS="ti-codec-engine ti-biosutils ti-dsplink"
 
 do_compile() {
 	make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
diff --git a/recipes/ti/ti-local-power-manager.inc b/recipes/ti/ti-local-power-manager.inc
index ece42ffdba..c26e48afed 100644
--- a/recipes/ti/ti-local-power-manager.inc
+++ b/recipes/ti/ti-local-power-manager.inc
@@ -17,7 +17,7 @@ S = "${WORKDIR}/local_power_manager_linux_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/lpm/${PV}/exports/local_power_manager_linux_${PV}.tar.gz;name=lpmtarball"
 
-DEPENDS = "ti-dsplink-module ti-xdctools"
+DEPENDS = "ti-dsplink ti-xdctools"
 DEPENDS += "virtual/kernel"
 
 # SOC_FAMILY configuration
diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc
index 9f3da99ee6..f0af5f8096 100644
--- a/recipes/ti/ti-multimedia-common.inc
+++ b/recipes/ti/ti-multimedia-common.inc
@@ -27,7 +27,7 @@ export CE_INSTALL_DIR_RECIPE         = "${installdir}/ti-codec-engine-tree"
 export EDMA3_LLD_INSTALL_DIR_RECIPE  = "${installdir}/ti-edma3lld-tree"
 export LINUXUTILS_INSTALL_DIR_RECIPE = "${installdir}/ti-linuxutils-tree"
 export CMEM_INSTALL_DIR_RECIPE       = "${installdir}/ti-linuxutils-tree"
-export LINK_INSTALL_DIR_RECIPE       = "${installdir}/ti-dsplink-module-tree/packages"
+export LINK_INSTALL_DIR_RECIPE       = "${installdir}/ti-dsplink-tree/packages"
 export LPM_INSTALL_DIR_RECIPE        = "${installdir}/ti-local-power-manager-tree"
 export DMAI_INSTALL_DIR_RECIPE       = "${installdir}/ti-dmai-tree"
 
diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc
index 20a01494fe..12faee634d 100644
--- a/recipes/ti/ti-paths.inc
+++ b/recipes/ti/ti-paths.inc
@@ -1,43 +1,13 @@
 require ti-multimedia-common.inc
 
-export PLATFORM
-
 export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
 
-# This tells codec engine which targets to build
-#DEVICES ?= "DM6446"
-#DEVICES_omap3 = "OMAP3530"
-#DEVICES_dm6446 = "DM6446"
-
-DSPLINKPLATFORM ?= "DAVINCI"
-DSPLINKPLATFORM_dm6446 = "DAVINCI"
-
 PLATFORM ?= "dm6446"
 PLATFORM_dm6446 = "dm6446"
 PLATFORM_dm6467 = "dm6467"
-
-DSPLINKDSP ?= "C64XX"
-
-DSPLINKSOC ?= "DM6446"
-
-DSPCFG ?= "DM6446GEMSHMEM"
-
-GPPOS ?= "LINUX_GCC"
-
-export DEVICES
-export DSPLINKPLATFORM
-export DSPLINKDSP
-export DSPLINKSOC
-export DSPCFG
-export GPPOS
 export PLATFORM
-export LPMDSPPOWERSOC
-
-DSPPOWERSOC ?= "dm6446"
 
 export CODEC ?= "${CODEC_INSTALL_DIR}"
 
-export DSPLINK = "${LINK_INSTALL_DIR}/dsplink"
-
 installdir = "${datadir}/ti"