ti recipes: start moving from -native to machine specific

Signed-off-by: Koen Kooi <k-kooi@ti.com>

39 files changed, 258 insertions, 193 deletions

diff --git a/recipes/ti/README b/recipes/ti/README
index cf37c06844..c239d233bc 100644
--- a/recipes/ti/README
+++ b/recipes/ti/README
@@ -1,32 +1,48 @@
+= Introduction = 
+
 Depending on platform you need to download one or more components from the external URL and put in downloads directory.
 
-DM355
------
- - Code Engine 2.24.01
+Most components are 'TSPA' now, which mean OE can download them automagically, if a download fails, you should be able to find the archive you need at:
+
+* C6000 Code Generation Tools v6.1.9 Linux (ti_cgt_c6000_6.1.9_setup_linux_x86.bin)
+	https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm
+* Generic download URI
+	http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/
+
+= Version selection =
+
+Tool versions are clustered per codec-engine release, since that combination gets the most testing. Like all other preferred-version files they stored in conf/distro/include:
+
+angstrom-codec-engine-2.25-preferred-versions.inc
+angstrom-codec-engine-2.25.01-preferred-versions.inc
+
+You can select between them by putting the following in local.conf:
+
+CE_VERSION = "2.25.01"
+
+You will get a parsing failure if a non-existing version is selected.
+
+= Recipe setup =
+
+Since most of the recipes in this directory deal with a DSP (e.g OMAP3) or accelerators (e.g DM3xx) and have strict per platform version dependencies they are all machine specific. For things like codec-engine, kernel drivers and userspace samples this makes sense, since they are tied to a specific device or platform. For things like codegen and xdc-tools this is weird, but it's the least bad option currently.
+
+The complete unpacked trees are staged to staging/machine/usr/share/ti/${PN}(-tree) and all the _INSTALL_DIR vars will point to that. To make this work there is a ti-staging.inc which contains:
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
+INHIBIT_PACKAGE_STRIP = "1"
+
+The 'BASEPKG_HOST_SYS' bit is what makes it work, but cause trouble is you want to read from it, so ti-multimedia-common.inc does:
+
+export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x"
+export CODEGEN_INSTALL_DIR    = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${CODEGEN_INSTALL_DIR_RECIPE}"
+
+Which will point it to the machine specific staging like we want it to.
+
 
-OMAP3530
-------
-  - Code Engine 2.24
-  - DSP/BIOS Link for Linux 1.61.03  
-  - DSP/BIOS 5.33.04
-  - C6000 Code Generation Tools v6.1.9 Linux
-  - Local Power Managment 1.24
 
-URL's:
-------
-* CE 2.24.01 (codec_engine_2_24.01.tar.gz)
-	http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/CE/ce_2_24/index.html
 
-* DSP/BIOS 5.33.04 (bios_setuplinux_5_33_04.bin) 
-	http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/bios/bios_5_33/bios_5_33_04/index_external.html
 
-* DSP/BIOS Link for Linux 1.61.03 (dsplink_1_61_03.tar.gz)
-	http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/link/link_1_60/index.html
 
-* C6000 Code Generation Tools v6.1.9 Linux (ti_cgt_c6000_6.1.9_setup_linux_x86.bin)
-	https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm
-* LPM (local_power_manager_1_24.tar.gz) http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/linuxutils/linuxutils_2_24/index.html 
 
-* Generic download URI
-	http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/
 
diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb
index de09d36caa..063a615cff 100644
--- a/recipes/ti/gstreamer-ti_svn.bb
+++ b/recipes/ti/gstreamer-ti_svn.bb
@@ -44,6 +44,10 @@ export DECODE_COMBO = "${installdir}/codec-combo/decodeCombo.x64P"
 
 CPPFLAGS_append = " -DPlatform_${PLATFORM}"
 
+do_configure_prepend() {
+	sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/src/Makefile.am
+}
+
 do_install_prepend () {
         # install gstreamer demo scripts
         install -d ${D}/${installdir}/gst
diff --git a/recipes/ti/ti-biosutils.inc b/recipes/ti/ti-biosutils.inc
index c06b20cb0f..6391dceb8e 100644
--- a/recipes/ti/ti-biosutils.inc
+++ b/recipes/ti/ti-biosutils.inc
@@ -8,4 +8,12 @@ SRC_URI = "${BASE_SRC_URI}/${PV}${PVsuffix}/exports/biosutils_${PV}.tar.gz;name=
 
 S = "${WORKDIR}/biosutils_${PV}"
 
+require ti-paths.inc
+require ti-staging.inc
+
+do_install() {
+    install -d ${D}${BIOSUTILS_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${BIOSUTILS_INSTALL_DIR_RECIPE}
+}
+
 
diff --git a/recipes/ti/ti-biosutils-native_1.02.02.bb b/recipes/ti/ti-biosutils_1.02.02.bb
index 2181b1a3cc..5f4be99872 100644
--- a/recipes/ti/ti-biosutils-native_1.02.02.bb
+++ b/recipes/ti/ti-biosutils_1.02.02.bb
@@ -6,11 +6,5 @@ SRC_URI[biosutilstarball.sha256sum] = "df486500bdc8dbe3800fc7efe4241e6fa5b1827ba
 PV = "1_02_02"
 PVsuffix = "_02"
 
-inherit native
-
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/ti-biosutils
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-biosutils
-}
 
 
diff --git a/recipes/ti/ti-cgt6x.inc b/recipes/ti/ti-cgt6x.inc
index fa46d12aeb..9682fcfa87 100644
--- a/recipes/ti/ti-cgt6x.inc
+++ b/recipes/ti/ti-cgt6x.inc
@@ -6,4 +6,11 @@ TI_BIN_UNPK_CMDS="Y:qY:workdir: : "
 TI_BIN_UNPK_WDEXT="/cgt"
 
 require ti-eula-unpack.inc
+require ti-paths.inc
+require ti-staging.inc
 
+
+do_install() {
+    install -d ${D}${CODEGEN_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CODEGEN_INSTALL_DIR_RECIPE}
+}
diff --git a/recipes/ti/ti-cgt6x-native_6.0.21.bb b/recipes/ti/ti-cgt6x_6.0.21.bb
index 1913eb0272..16a5547b1f 100644
--- a/recipes/ti/ti-cgt6x-native_6.0.21.bb
+++ b/recipes/ti/ti-cgt6x_6.0.21.bb
@@ -1,5 +1,4 @@
 require ti-cgt6x.inc
-inherit native
 
 # download ti_cgt_c6000_6.0.21_setup_linux_x86.bin from https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm and copy in Arago (or OE) download directory.
 
@@ -13,9 +12,4 @@ S = "${WORKDIR}/cgt"
 PV = "6021"
 PR = "r3"
 
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
-}
-
 
diff --git a/recipes/ti/ti-cgt6x-native_6.1.9.bb b/recipes/ti/ti-cgt6x_6.1.9.bb
index 0005c6ee38..594bca2fef 100644
--- a/recipes/ti/ti-cgt6x-native_6.1.9.bb
+++ b/recipes/ti/ti-cgt6x_6.1.9.bb
@@ -1,5 +1,4 @@
 require ti-cgt6x.inc
-inherit native
 
 # download ti_cgt_c6000_6.1.9_setup_linux_x86.bin from https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm and copy in Arago/OE download directory.
 
@@ -13,9 +12,5 @@ S = "${WORKDIR}/cgt"
 PV = "6190"
 PR = "r1"
 
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
-}
 
 
diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc
index 28f5887542..5449f6be43 100644
--- a/recipes/ti/ti-codec-engine.inc
+++ b/recipes/ti/ti-codec-engine.inc
@@ -3,11 +3,11 @@ DESCRIPTION = "Codec Engine for TI ARM/DSP processors"
 require ti-paths.inc
 
 # compile time dependencies
-DEPENDS = "ti-framework-components ti-xdais-native ti-xdctools-native ti-cgt6x-native ti-biosutils-native ti-edma3lld-native"
+DEPENDS = "ti-framework-components ti-xdais ti-xdctools ti-cgt6x ti-biosutils ti-edma3lld"
 
-DEPENDS_append_dm6446 	= " ti-dspbios-native ti-linuxutils ti-dsplink-module"
-DEPENDS_append_omap3   	= " ti-dspbios-native ti-linuxutils ti-dsplink-module"
-DEPENDS_append_omapl138 = " ti-dspbios-native ti-linuxutils ti-dsplink-module"
+DEPENDS_append_dm6446 	= " ti-dspbios ti-linuxutils ti-dsplink-module"
+DEPENDS_append_omap3   	= " ti-dspbios ti-linuxutils ti-dsplink-module ti-lpm-module"
+DEPENDS_append_omapl138 = " ti-dspbios ti-linuxutils ti-dsplink-module"
 
 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"
 
@@ -25,9 +25,8 @@ DEVICES_omapl138 ?= "OMAPL138"
 PROGRAMS        ?= "APP_CLIENT DSP_SERVER"
 PROGRAMS_dm355   = "APP_LOCAL"
 
-LINK_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module/packages"
-CGT6x_DIR = "${STAGING_DIR_NATIVE}/ti-cgt6x-native"
-XDCTOOLS_DIR = "${STAGING_DIR_NATIVE}/ti-xdctools-native"
+CGT6x_DIR = "${CODEGEN_INSTALL_DIR}"
+XDCTOOLS_DIR = "${XDC_INSTALL_DIR}"
 CE_INSTALL_DIR = "${S}"
 
 do_compile () {
@@ -121,13 +120,17 @@ do_install() {
 }
 
 
-# stage tree - other packages may need this
+# We can't use CE_INSTALL_DIR directly since we redefined it earlier on
 do_stage() {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ 
+    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}
 }
 
-RDEPENDS_ti-codec-engine-apps = "ti-cmem-module ti-dsplink-module"
+
+RDEPENDS_ti-codec-engine-apps = "ti-cmem-module"
+RDEPENDS_append_dm6446   = " ti-dsplink-module"
+RDEPENDS_append_omap3    = " ti-dsplink-module"
+RDEPENDS_append_omapl138 = " ti-dsplink-module"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes/ti/ti-codecs-omap3530_1.01.bb b/recipes/ti/ti-codecs-omap3530_1.01.bb
index 104b128282..e75075f1b2 100644
--- a/recipes/ti/ti-codecs-omap3530_1.01.bb
+++ b/recipes/ti/ti-codecs-omap3530_1.01.bb
@@ -11,6 +11,7 @@ require ti-eula-unpack.inc
 S = "${WORKDIR}/dvsdk_3_00_01_42/cs1omap3530_1_00_01"
 
 DEPENDS="ti-codec-engine ti-linuxutils"
+RREPLACES_${PN} = "ti-cs1-omap3530"
 
 export CODEGEN_INSTALL_DIR
 
diff --git a/recipes/ti/ti-codecs-omapl138_1.0.bb b/recipes/ti/ti-codecs-omapl138_1.0.bb
new file mode 100644
index 0000000000..491bf937dd
--- /dev/null
+++ b/recipes/ti/ti-codecs-omapl138_1.0.bb
@@ -0,0 +1,35 @@
+require ti-codec.inc
+ 
+# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation.
+SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/sdk/omap_l138/1_00/latest/exports/${BINFILE};name=l138codecs"
+
+SRC_URI[l138codecs.md5sum] = "64a53cd55bc63d3a6f4db742aff90de9"
+SRC_URI[l138codecs.sha256sum] = "4fb1075ad83f6017616410eff35ada7d567f1ee1b5b23624a817e8fc7dda3f8a"
+
+require ti-eula-unpack.inc
+
+# Specify names of the InstallJammer binary file and the tarball it extracts
+BINFILE = "cs1omapl138_${PV}-v2_setup_linux.bin"
+TI_BIN_UNPK_CMDS = "y:Y: qY:workdir"
+
+S = "${WORKDIR}/OMAP_L138_arm_${PV}_08/cs1omapl138_${PV}"
+
+# Yes, the xdc stuff still breaks with a '.' in PWD
+PV = "1_00_00"
+PR = "r2"
+
+do_compile() {
+	echo "do nothing"
+}
+
+#generic codec
+DSPSUFFIX_omapl138 = "x64P"
+
+do_install () {
+    install -d ${D}/${installdir}/codec-combo
+	cd ${S}
+	for file in `find . -name *.${DSPSUFFIX}`; do
+		cp ${file} ${D}/${installdir}/codec-combo
+	done
+}
+
diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb
index 990f96784e..c7b08fb99b 100644
--- a/recipes/ti/ti-dmai_svn.bb
+++ b/recipes/ti/ti-dmai_svn.bb
@@ -7,14 +7,14 @@ inherit module-base
 MACHINE_KERNEL_PR_append = "c"
 
 # compile time dependencies
-DEPENDS = "alsa-lib ti-framework-components ti-codec-engine ti-xdctools-native"
+DEPENDS = "alsa-lib ti-framework-components ti-codec-engine ti-xdctools"
 
-DEPENDS_append_omap3    = " ti-dspbios-native ti-cgt6x-native ti-codecs-omap3530 virtual/kernel ti-linuxutils"
-DEPENDS_append_dm6446 	= " ti-dspbios-native ti-cgt6x-native ti-codecs-dm6446 virtual/kernel ti-linuxutils"
+DEPENDS_append_omap3    = " ti-dspbios ti-cgt6x ti-codecs-omap3530 virtual/kernel ti-linuxutils"
+DEPENDS_append_dm6446 	= " ti-dspbios ti-cgt6x ti-codecs-dm6446 virtual/kernel ti-linuxutils"
 DEPENDS_append_dm355  	= " ti-codecs-dm355 virtual/kernel"
 DEPENDS_append_dm365    = " ti-codecs-dm365 virtual/kernel"
-DEPENDS_append_omapl137 = " ti-dspbios-native ti-cgt6x-native ti-codecs-omapl137 virtual/kernel ti-linuxutils"
-DEPENDS_append_omapl138 = " ti-dspbios-native ti-cgt6x-native ti-codecs-omapl138 virtual/kernel ti-linuxutils"
+DEPENDS_append_omapl137 = " ti-dspbios ti-cgt6x ti-codecs-omapl137 virtual/kernel ti-linuxutils"
+DEPENDS_append_omapl138 = " ti-dspbios ti-cgt6x ti-codecs-omapl138 virtual/kernel ti-linuxutils"
 
 # Define DMAI build time variables
 TARGET_omap3     = "o3530_al"
@@ -25,18 +25,18 @@ TARGET_dm355     = "dm355_al"
 TARGET_dm365     = "dm365_al"
 TARGET          ?= "all"
 
-CGT6x_DIR = "${STAGING_DIR_NATIVE}/ti-cgt6x-native"
-XDCTOOLS_DIR = "${STAGING_DIR_NATIVE}/ti-xdctools-native"
 USER_XDC_PATH = "${CE_INSTALL_DIR}/examples"
 
 PARALLEL_MAKE = ""
 
 do_configure () {
+	 sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/dmai/packages/ti/sdo/dmai/apps/Makefile.app
+	 sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/dmai/packages/ti/sdo/dmai/Makefile
 
 	# PSP kernel is based on older DSS. we need to replace linux/omapfb.h with
 	# mach/omapfb.h 
 
-    if ![ -e ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ] ; then 
+    if ! [ -e ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ] ; then 
         sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c
         sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/dmai/packages/ti/sdo/dmai/linux/priv/_Display.h
     fi
@@ -47,27 +47,30 @@ do_compile () {
 
 	unset DMAI_INSTALL_DIR
 	cd ${S}
-	make XDC_INSTALL_DIR="${XDCTOOLS_DIR}" PLATFORM="${TARGET}" clean
-
-	#  TODO: Figure out how to pass the alsa require location, currently 
-    #  LINUXLIBS_INSTALL_DIR is hard-coded for armv5te
-	make CE_INSTALL_DIR="${CE_INSTALL_DIR}" \
-		CODEC_INSTALL_DIR="${CODEC}" \
-		FC_INSTALL_DIR="${FC_INSTALL_DIR}" \
-		LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \
-		XDC_INSTALL_DIR="${XDCTOOLS_DIR}" \
-		CODEGEN_INSTALL_DIR="${CGT6x_DIR}" \
-		BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\
-		LINUXLIBS_INSTALL_DIR="${STAGING_DIR_HOST}/usr" \
-		USER_XDC_PATH="${USER_XDC_PATH}" \
-		CROSS_COMPILE="${CROSS_DIR}/bin/${TARGET_PREFIX}" \
-		VERBOSE="true" \
-		XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \
-		LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
-		CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \
-		LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \	
-		MVTOOL_PREFIX="${TARGET_PREFIX}" \
-                PLATFORM="${TARGET}"
+	make XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" PLATFORM="${TARGET}" clean
+
+	for dir in ${S}/dmai ${S}/tests ; do
+		cd $dir
+		#  TODO: Figure out how to pass the alsa require location, currently 
+		#  LINUXLIBS_INSTALL_DIR is hard-coded for armv5te
+		make CE_INSTALL_DIR="${CE_INSTALL_DIR}" \
+			CODEC_INSTALL_DIR="${CODEC}" \
+			FC_INSTALL_DIR="${FC_INSTALL_DIR}" \
+			LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \
+			XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \
+			CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \
+			BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\
+			LINUXLIBS_INSTALL_DIR="${STAGING_DIR_HOST}/usr" \
+			USER_XDC_PATH="${USER_XDC_PATH}" \
+			CROSS_COMPILE="${CROSS_DIR}/bin/${TARGET_PREFIX}" \
+			VERBOSE="true" \
+			XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \
+			LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
+			CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \
+			LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \	
+			MVTOOL_PREFIX="${TARGET_PREFIX}" \
+			PLATFORM="${TARGET}" 
+	done
 }
 
 do_install () {
diff --git a/recipes/ti/ti-dspbios-native.inc b/recipes/ti/ti-dspbios-native.inc
deleted file mode 100644
index 40f010433d..0000000000
--- a/recipes/ti/ti-dspbios-native.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-require ti-paths.inc
-require ti-dspbios.inc
-inherit native
-
-SRC_URI	= "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/dspbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=biosbin"
-
-BINFILE="bios_setuplinux_${PV}.bin"
-
-S = "${WORKDIR}/bios_${PV}"
-
-do_stage() {
-    install -d ${BIOS_INSTALL_DIR}
-    cp -pPrf ${S}/* ${BIOS_INSTALL_DIR}
-    chmod 755 -R ${BIOS_INSTALL_DIR}/*
-}
-
-
diff --git a/recipes/ti/ti-dspbios.inc b/recipes/ti/ti-dspbios.inc
index 87b2cb5636..c47ac79b11 100644
--- a/recipes/ti/ti-dspbios.inc
+++ b/recipes/ti/ti-dspbios.inc
@@ -3,6 +3,21 @@ DESCRIPTION = "TI DSP/BIOS for Davinci and OMAP processor"
 TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
 
 require ti-eula-unpack.inc
+require ti-paths.inc
+require ti-staging.inc
 
 PE = "1"
 
+SRC_URI	= "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/dspbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=biosbin"
+
+BINFILE="bios_setuplinux_${PV}.bin"
+
+S = "${WORKDIR}/bios_${PV}"
+
+do_install() {
+    chmod 755 -R ${S}
+    install -d ${D}${BIOS_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${BIOS_INSTALL_DIR_RECIPE}
+}
+
+
diff --git a/recipes/ti/ti-dspbios-native_5.33.02.bb b/recipes/ti/ti-dspbios_5.33.02.bb
index ccb04b310f..c21411c830 100644
--- a/recipes/ti/ti-dspbios-native_5.33.02.bb
+++ b/recipes/ti/ti-dspbios_5.33.02.bb
@@ -1,5 +1,4 @@
 require ti-dspbios.inc
-inherit native
 
 # download bios_setuplinux_5_33_02.bin from https://www-a.ti.com/downloads/sds_support/targetcontent/bios/bios_5_33/bios_5_33_02/index_external.html and copy in Arago/OE installation directory
 
@@ -12,9 +11,9 @@ S = "${WORKDIR}/bios_5_33_02"
 PV = "5_33_02"
 PR = "r14"
 
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
+do_install() {
+    install -d ${BIOS_INSTALL_DIR}
+    cp -pPrf ${S}/* ${BIOS_INSTALL_DIR}
 }
 
 
diff --git a/recipes/ti/ti-dspbios-native_5.33.04.bb b/recipes/ti/ti-dspbios_5.33.04.bb
index 6924e93fbe..f8894e1a67 100644
--- a/recipes/ti/ti-dspbios-native_5.33.04.bb
+++ b/recipes/ti/ti-dspbios_5.33.04.bb
@@ -1,4 +1,4 @@
-require ti-dspbios-native.inc
+require ti-dspbios.inc
 
 SRC_URI[biosbin.md5sum] = "fcffe1618f20024fd6580f47cdc0059b"
 SRC_URI[biosbin.sha256sum] = "2c1e7feec569a19d3093b136da6aa03574f94052810fe7a78cc81eb37adda24b"
diff --git a/recipes/ti/ti-dspbios-native_5.33.06.bb b/recipes/ti/ti-dspbios_5.33.06.bb
index e127681fed..d745822501 100644
--- a/recipes/ti/ti-dspbios-native_5.33.06.bb
+++ b/recipes/ti/ti-dspbios_5.33.06.bb
@@ -1,4 +1,4 @@
-require ti-dspbios-native.inc
+require ti-dspbios.inc
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/ti/ti-dspbios-native_5.41.02.14.bb b/recipes/ti/ti-dspbios_5.41.02.14.bb
index 2d07807ade..5986fb0038 100644
--- a/recipes/ti/ti-dspbios-native_5.41.02.14.bb
+++ b/recipes/ti/ti-dspbios_5.41.02.14.bb
@@ -1,4 +1,4 @@
-require ti-dspbios-native.inc
+require ti-dspbios.inc
 
 DEFAULT_FREFERENCE_omapl138 = "2"
 
diff --git a/recipes/ti/ti-dsplink-module.inc b/recipes/ti/ti-dsplink-module.inc
index f6ad0b18d6..a976aa44f8 100644
--- a/recipes/ti/ti-dsplink-module.inc
+++ b/recipes/ti/ti-dsplink-module.inc
@@ -8,7 +8,7 @@ MACHINE_KERNEL_PR_append = "a"
 inherit module
 
 # compile and run time dependencies
-DEPENDS 	+= "virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update-modules ti-xdctools-native"
+DEPENDS 	+= "virtual/kernel perl-native ti-dspbios ti-cgt6x update-modules ti-xdctools"
 
 SRC_URI = "http://install.source.dir.local/dsplink_${PV}.tar.gz \
 		   file://loadmodules-ti-dsplink-apps.sh \
@@ -29,7 +29,8 @@ DSPLINKDSPCFG_omapl137  = "OMAPL1XXGEMSHMEM"
 DSPLINKDSPCFG_omapl138  = "OMAPL138GEMSHMEM"
 DSPLINKDSPCFG          ?= "DM6446GEMSHMEM"
 
-
+DSPLINKGPPOS_dm355      = "LINUX_GCC"
+DSPLINKGPPOS_dm365      = "LINUX_GCC"
 DSPLINKGPPOS_dm6446     = "MVL5G"
 DSPLINKGPPOS_omapl137   = "ARM"
 DSPLINKGPPOS_omapl138   = "ARM"
@@ -39,9 +40,9 @@ DSPLINKGPPOS           ?= "ARM"
 DSPLINK = "${S}/dsplink"
 export DSPLINK
 
-STAGING_TI_DSPBIOS_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native"
-STAGING_TI_CGT6x_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native"
-STAGING_TI_XDCTOOL_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native"
+STAGING_TI_DSPBIOS_DIR="${BIOS_INSTALL_DIR}"
+STAGING_TI_CGT6x_DIR="${CODEGEN_INSTALL_DIR}"
+STAGING_TI_XDCTOOL_INSTALL_DIR="${XDC_INSTALL_DIR}"
 
 do_configure() {
 
@@ -151,8 +152,8 @@ do_install () {
 }
 
 do_stage () {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages
-    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages
+    install -d ${LINK_INSTALL_DIR}
+    cp -pPrf ${S}/* ${LINK_INSTALL_DIR}
 }
 
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes/ti/ti-dsplink-module_1.64.bb b/recipes/ti/ti-dsplink-module_1.64.bb
index 2b77530e7e..6b10b93cde 100644
--- a/recipes/ti/ti-dsplink-module_1.64.bb
+++ b/recipes/ti/ti-dsplink-module_1.64.bb
@@ -8,6 +8,7 @@ SRC_URI[dsplinktarball.md5sum] = "90223da7c88af57d12936adeba1a0661"
 SRC_URI[dsplinktarball.sha256sum] = "32b6fbae2b61f5f71ab3eae9d2f5ad6b75d682ad8bde9963152830be1f8d286b"
 
 # tconf from xdctools dislikes '.' in pwd :/
+PE = "1"
 PV = "1_64"
 S = "${WORKDIR}/dsplink_linux_${PV}"
 
diff --git a/recipes/ti/ti-edma3lld-native.inc b/recipes/ti/ti-edma3lld-native.inc
deleted file mode 100644
index 8d2627ec5e..0000000000
--- a/recipes/ti/ti-edma3lld-native.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-require ti-paths.inc
-require ti-edma3lld.inc
-inherit native
-
-SRC_URI	= "http://something/EDMA3_LLD_setuplinux_${PV}.tar.gz;name=edma3lldtarball"
-#http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/edma3_lld/EDMA3-BIOS5-LLD/01_11/edma3_lld_01_11/EDMA3_LLD_setuplinux_${PV}.bin;name=edma3lldbin"
-
-#BINFILE="EDMA3_LLD_setuplinux_${PV}.bin"
-
-S = "${WORKDIR}/edma3_lld_${PV}"
-
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/ti-edma3lld
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-edma3lld
-}
-
-
diff --git a/recipes/ti/ti-edma3lld.inc b/recipes/ti/ti-edma3lld.inc
index 101dc7aaa1..c0df40e1a7 100644
--- a/recipes/ti/ti-edma3lld.inc
+++ b/recipes/ti/ti-edma3lld.inc
@@ -6,3 +6,19 @@ TI_BIN_UNPK_CMDS="Y:workdir"
 
 PE = "1"
 
+require ti-paths.inc
+require ti-staging.inc
+
+SRC_URI	= "http://something/EDMA3_LLD_setuplinux_${PV}.tar.gz;name=edma3lldtarball"
+#http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/edma3_lld/EDMA3-BIOS5-LLD/01_11/edma3_lld_01_11/EDMA3_LLD_setuplinux_${PV}.bin;name=edma3lldbin"
+
+#BINFILE="EDMA3_LLD_setuplinux_${PV}.bin"
+
+S = "${WORKDIR}/edma3_lld_${PV}"
+
+do_install() {
+    install -d ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
+}
+
+
diff --git a/recipes/ti/ti-edma3lld-native_01.11.00.02.bb b/recipes/ti/ti-edma3lld_01.11.00.02.bb
index 66fbf436d0..d7541b8965 100644
--- a/recipes/ti/ti-edma3lld-native_01.11.00.02.bb
+++ b/recipes/ti/ti-edma3lld_01.11.00.02.bb
@@ -1,4 +1,4 @@
-require ti-edma3lld-native.inc
+require ti-edma3lld.inc
 
 #SRC_URI[edma3lldbin.md5sum] = "fa15c104cfe03227bf181ecf4094c0d9"
 #SRC_URI[edma3lldbin.sha256sum] = "9650d1fc8b441d46095a8b4e70dab5d7438351f38e03918d30bed0e4ffc50e66"
diff --git a/recipes/ti/ti-framework-components.inc b/recipes/ti/ti-framework-components.inc
index 7f31014728..c52f697313 100644
--- a/recipes/ti/ti-framework-components.inc
+++ b/recipes/ti/ti-framework-components.inc
@@ -3,20 +3,21 @@ DESCRIPTION = "Framework Components for TI ARM/DSP processors"
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball"
 
 require ti-paths.inc
+require ti-staging.inc
 
 S = "${WORKDIR}/framework_components_${PV}"
 
 # compile time dependencies
-DEPENDS += "ti-xdctools-native ti-xdais-native ti-linuxutils"
+DEPENDS += "ti-xdctools ti-xdais ti-linuxutils"
 
 do_compile () {
         echo "! Do not rebuild for now !"
 }
 
 # stage tree - other packages may need this
-do_stage() {
-    install -d ${FC_INSTALL_DIR}
-    cp -pPrf ${S}/* ${FC_INSTALL_DIR}
+do_install() {
+    install -d ${D}${FC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${FC_INSTALL_DIR_RECIPE}
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/ti/ti-linuxutils.inc b/recipes/ti/ti-linuxutils.inc
index b1f876d0d3..d96477d741 100644
--- a/recipes/ti/ti-linuxutils.inc
+++ b/recipes/ti/ti-linuxutils.inc
@@ -61,8 +61,8 @@ do_install () {
 
 # stage tree - other packages may need this
 do_stage() {
-    install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}
-    cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/
+    install -d ${LINUXUTILS_INSTALL_DIR}
+    cp -pPrf ${S}/* ${LINUXUTILS_INSTALL_DIR}
 }
 
 PACKAGES =+ " ti-cmem-module \
diff --git a/recipes/ti/ti-linuxutils_2.25.01.06.bb b/recipes/ti/ti-linuxutils_2.25.01.06.bb
index a75fdba30d..89a068b4ff 100644
--- a/recipes/ti/ti-linuxutils_2.25.01.06.bb
+++ b/recipes/ti/ti-linuxutils_2.25.01.06.bb
@@ -1,3 +1,4 @@
 require ti-linuxutils.inc
 
+PE = "1"
 PV = "2_25_01_06"
diff --git a/recipes/ti/ti-lpm-module_1.24.01.bb b/recipes/ti/ti-lpm-module_1.24.01.bb
index d5c277117e..31f8a2c66c 100644
--- a/recipes/ti/ti-lpm-module_1.24.01.bb
+++ b/recipes/ti/ti-lpm-module_1.24.01.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "LPM module for TI OMAP3 processors"
 
-DEPENDS = "ti-linuxutils"
+DEPENDS = "ti-linuxutils ti-dsplink-module"
 
 # tconf breaks with '.' in PWD
 PV = "1_24_01"
@@ -25,7 +25,7 @@ do_compile () {
     unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
     cd ${S}/packages/ti/bios/power/modules/${LPMDSPPOWERSOC}/lpm
     make \
-      DSPLINK_REPO="${DSPLINK}/.." \
+      DSPLINK_REPO="${LINK_INSTALL_DIR}" \
       LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \
       MVTOOL_PREFIX="${TARGET_PREFIX}" \
       clean default
diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc
index 1cfa679486..623bc86fad 100644
--- a/recipes/ti/ti-multimedia-common.inc
+++ b/recipes/ti/ti-multimedia-common.inc
@@ -13,21 +13,39 @@ export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
 export CODEC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codecs"
 
 export LINUXLIBS_INSTALL_DIR  = "${STAGING_DIR_HOST}/usr"
-export CODEGEN_INSTALL_DIR    = "${STAGING_DIR_NATIVE}/ti-cgt6x-native"
-export XDC_INSTALL_DIR        = "${STAGING_DIR_NATIVE}/ti-xdctools-native"
-export XDAIS_INSTALL_DIR      = "${STAGING_DIR_NATIVE}/ti-xdais"
-export BIOS_INSTALL_DIR       = "${STAGING_DIR_NATIVE}/ti-dspbios-native"
-export BIOSUTILS_INSTALL_DIR  = "${STAGING_DIR_NATIVE}/ti-biosutils"
-export EDMA3_LLD_INSTALL_DIR  = "${STAGING_DIR_NATIVE}/ti-edma3lld"
-
-export CE_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine"
-export FC_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-framework-components"
 export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
-export LINUXUTILS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-linuxutils"
-export CMEM_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-linuxutils"
-export LINK_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module"
-export LPM_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-local-power-manager"
-export DMAI_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai"
+
+# This is where do_install will put it
+export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x"
+export XDC_INSTALL_DIR_RECIPE        = "${installdir}/ti-xdctools"
+export XDAIS_INSTALL_DIR_RECIPE      = "${installdir}/ti-xdais"
+export BIOS_INSTALL_DIR_RECIPE       = "${installdir}/ti-dspbios"
+export BIOSUTILS_INSTALL_DIR_RECIPE  = "${installdir}/ti-biosutils"
+export FC_INSTALL_DIR_RECIPE         = "${installdir}/ti-framework-components"
+
+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 LPM_INSTALL_DIR_RECIPE        = "${installdir}/ti-local-power-manager-tree"
+export DMAI_INSTALL_DIR_RECIPE       = "${installdir}/ti-dmai-tree"
+
+# This is where the tools will end up in staging provided PACKAGE_ARCH = ${MACHINE_ARCH} is set
+export CODEGEN_INSTALL_DIR    = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}"
+export XDC_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDC_INSTALL_DIR_RECIPE}"
+export XDAIS_INSTALL_DIR      = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${XDAIS_INSTALL_DIR_RECIPE}"
+export BIOS_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOS_INSTALL_DIR_RECIPE}"
+export BIOSUTILS_INSTALL_DIR  = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOSUTILS_INSTALL_DIR_RECIPE}"
+export FC_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${FC_INSTALL_DIR_RECIPE}"
+
+export CE_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CE_INSTALL_DIR_RECIPE}"
+export EDMA3_LLD_INSTALL_DIR  = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${EDMA3_LLD_INSTALL_DIR_RECIPE}"
+export LINUXUTILS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINUXUTILS_INSTALL_DIR_RECIPE}"
+export CMEM_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CMEM_INSTALL_DIR_RECIPE}"
+export LINK_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LINK_INSTALL_DIR_RECIPE}"
+export LPM_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LPM_INSTALL_DIR_RECIPE}"
+export DMAI_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DMAI_INSTALL_DIR_RECIPE}"
 
 export USER_XDC_PATH    = "${CE_INSTALL_DIR}/examples"
 export XDC_TARGET       = gnu.targets.arm.GCArmv5T
diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc
index 3a9eb3dbbc..8e9c89fb8c 100644
--- a/recipes/ti/ti-paths.inc
+++ b/recipes/ti/ti-paths.inc
@@ -46,7 +46,7 @@ DSPPOWERSOC ?= "dm6446"
 
 export CODEC ?= "${CODEC_INSTALL_DIR}"
 
-export DSPLINK = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module/packages/dsplink/"
+export DSPLINK = "${LINK_INSTALL_DIR}/dsplink"
 
 installdir = "${datadir}/ti"
 
diff --git a/recipes/ti/ti-staging.inc b/recipes/ti/ti-staging.inc
new file mode 100644
index 0000000000..4e0ddfa515
--- /dev/null
+++ b/recipes/ti/ti-staging.inc
@@ -0,0 +1,4 @@
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+BASEPKG_HOST_SYS = "${MULTIMACH_HOST_SYS}"
+INHIBIT_PACKAGE_STRIP = "1"
+
diff --git a/recipes/ti/ti-xdais-native_6.23.bb b/recipes/ti/ti-xdais-native_6.23.bb
deleted file mode 100644
index 751e4bd006..0000000000
--- a/recipes/ti/ti-xdais-native_6.23.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ti-xdais.inc
-
-PV = "6_23"
-
-inherit native
-
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/ti-xdais
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-xdais
-}
-
-
diff --git a/recipes/ti/ti-xdais.inc b/recipes/ti/ti-xdais.inc
index e200c895ac..41f2c53344 100644
--- a/recipes/ti/ti-xdais.inc
+++ b/recipes/ti/ti-xdais.inc
@@ -9,4 +9,11 @@ SRC_URI	= "${BASE_SRC_URI}/xdais_${PV}${PVEXTENSION}.tar.gz;name=xdaisgz"
 
 S = "${WORKDIR}/xdais_${PV}${PVEXTENSION}"
 
+require ti-paths.inc
+require ti-staging.inc
+
+do_install() {
+    install -d ${D}${XDAIS_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${XDAIS_INSTALL_DIR_RECIPE}
+} 
 
diff --git a/recipes/ti/ti-xdais_6.23.bb b/recipes/ti/ti-xdais_6.23.bb
new file mode 100644
index 0000000000..8d04b4ebf9
--- /dev/null
+++ b/recipes/ti/ti-xdais_6.23.bb
@@ -0,0 +1,5 @@
+require ti-xdais.inc
+
+PV = "6_23"
+
+
diff --git a/recipes/ti/ti-xdais-native_6.25.00.07.bb b/recipes/ti/ti-xdais_6.25.00.07.bb
index 19d2bdbc36..3934ae0e28 100644
--- a/recipes/ti/ti-xdais-native_6.25.00.07.bb
+++ b/recipes/ti/ti-xdais_6.25.00.07.bb
@@ -5,11 +5,5 @@ SRC_URI[xdaisgz.sha256sum] = "1f7ad591c742616f087690f7cbdbb0b69e61091050a1f59a15
 
 PV = "6_25_00_07"
 
-inherit native
-
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/ti-xdais
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-xdais
-}
 
 
diff --git a/recipes/ti/ti-xdais-native_6.25.01.08.bb b/recipes/ti/ti-xdais_6.25.01.08.bb
index cc71c48b5e..9241274174 100644
--- a/recipes/ti/ti-xdais-native_6.25.01.08.bb
+++ b/recipes/ti/ti-xdais_6.25.01.08.bb
@@ -5,11 +5,5 @@ SRC_URI[xdaisgz.sha256sum] = "88866b1bbd3992141f47f7a672cd4a2fbeef729d582312a06a
 
 PV = "6_25_01_08"
 
-inherit native
-
-do_stage() {
-    install -d ${STAGING_DIR_NATIVE}/ti-xdais
-    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-xdais
-}
 
 
diff --git a/recipes/ti/ti-xdctools-native.inc b/recipes/ti/ti-xdctools-native.inc
deleted file mode 100644
index b58cc5dc14..0000000000
--- a/recipes/ti/ti-xdctools-native.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-inherit native
-
-require ti-xdctools.inc
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdctools_setuplinux_${PV}.bin;name=xdcbin"
-
-do_stage() {
-    install -d ${XDC_INSTALL_DIR}
-    cp -pPrf ${S}/* ${XDC_INSTALL_DIR}
-        chmod 755 -R  ${XDC_INSTALL_DIR}
-        chmod 755 -R  ${S}
-}
-
-
diff --git a/recipes/ti/ti-xdctools.inc b/recipes/ti/ti-xdctools.inc
index 10738ab08e..79698fd245 100644
--- a/recipes/ti/ti-xdctools.inc
+++ b/recipes/ti/ti-xdctools.inc
@@ -9,5 +9,14 @@ TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
 
 require ti-paths.inc
 require ti-eula-unpack.inc
+require ti-staging.inc
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdctools_setuplinux_${PV}.bin;name=xdcbin"
+
+do_install() {
+    chmod 755 -R  ${S}
+    install -d ${D}${XDC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${XDC_INSTALL_DIR_RECIPE}
+}
 
 
diff --git a/recipes/ti/ti-xdctools-native_3.15.01.59.bb b/recipes/ti/ti-xdctools_3.15.01.59.bb
index cc263f77d6..8ee104cae9 100644
--- a/recipes/ti/ti-xdctools-native_3.15.01.59.bb
+++ b/recipes/ti/ti-xdctools_3.15.01.59.bb
@@ -1,7 +1,7 @@
 BASE_PV = "3_15"
 PV = "3_15_01_59"
 
-require ti-xdctools-native.inc
+require ti-xdctools.inc
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_${BASE_PV}/exports/xdctools_setuplinux_${PV}.bin"
 
 
diff --git a/recipes/ti/ti-xdctools-native_3.15.04.70.bb b/recipes/ti/ti-xdctools_3.15.04.70.bb
index 832cf9f6a7..c7292b1a8f 100644
--- a/recipes/ti/ti-xdctools-native_3.15.04.70.bb
+++ b/recipes/ti/ti-xdctools_3.15.04.70.bb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 BASE_PV = "3_15"
 PV = "3_15_04_70"
 
-require ti-xdctools-native.inc
+require ti-xdctools.inc
 
 SRC_URI[xdcbin.md5sum] = "855a3b41d703a5c4e707d6ba9a23f94d"
 SRC_URI[xdcbin.sha256sum] = "e4eb68e62fc2774c1a4d0b19e4375e83cf39d249901647c86100930f511550a5"
diff --git a/recipes/ti/ti-xdctools-native_3.16.01.27.bb b/recipes/ti/ti-xdctools_3.16.01.27.bb
index 0d220e25e6..67c27553d6 100644
--- a/recipes/ti/ti-xdctools-native_3.16.01.27.bb
+++ b/recipes/ti/ti-xdctools_3.16.01.27.bb
@@ -1,7 +1,7 @@
 BASE_PV = "3_16"
 PV = "3_16_01_27"
 
-require ti-xdctools-native.inc
+require ti-xdctools.inc
 
 SRC_URI[xdcbin.md5sum] = "10d5ef7490cda01978205175cb43a618"
 SRC_URI[xdcbin.sha256sum] = "48f460eb64c092ff3f72b290457d69cd46a538e0a9086989584f1f0d2da32d54"