ti: point properly to toolchain, whether it's internal or external

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

diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc
index 5449f6b..6f415c5 100644 (file)
--- a/recipes/ti/ti-codec-engine.inc
+++ b/recipes/ti/ti-codec-engine.inc
@@ -60,7 +60,7 @@ endif/g' \
                      CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \
                      LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \
                      EDMA3_LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \
-                     CGTOOLS_V5T="${CROSS_DIR}" \
+                     CGTOOLS_V5T="${TOOLCHAIN_PATH}" \
                      CGTOOLS_C64P="${CGT6x_DIR}" \
                      CGTOOLS_C674="${CGT6x_DIR}" \
                      clean all

diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb
index c7b08fb..ecd2e83 100644 (file)
--- a/recipes/ti/ti-dmai_svn.bb
+++ b/recipes/ti/ti-dmai_svn.bb
@@ -62,7 +62,7 @@ do_compile () {
                        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}" \
+                       CROSS_COMPILE="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \
                        VERBOSE="true" \
                        XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \
                        LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \

diff --git a/recipes/ti/ti-dsplink-module.inc b/recipes/ti/ti-dsplink-module.inc
index a976aa4..047f94d 100644 (file)
--- a/recipes/ti/ti-dsplink-module.inc
+++ b/recipes/ti/ti-dsplink-module.inc
@@ -101,9 +101,9 @@ do_compile() {
     # Build the gpp samples
     cd ${DSPLINK}/gpp/src/samples
     cd ${DSPLINK}/gpp/src/samples && make \
-      BASE_TOOLCHAIN="${CROSS_DIR}" \
+      BASE_TOOLCHAIN="${TOOLCHAIN_PATH}" \
       BASE_CGTOOLS="${BASE_TOOLCHAIN}/bin" \
-      OSINC_PLATFORM="${CROSS_DIR}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include" \
+      OSINC_PLATFORM="${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include" \
       OSINC_TARGET="${BASE_TOOLCHAIN}/target/usr/include" \
       CROSS_COMPILE="${TARGET_PREFIX}" \
       CC="${KERNEL_CC}" \

diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc
index 623bc86..60d5259 100644 (file)
--- a/recipes/ti/ti-multimedia-common.inc
+++ b/recipes/ti/ti-multimedia-common.inc
@@ -1,13 +1,13 @@
 installdir = "${datadir}/ti"
 
 # needed for configuro:
-export CGTOOLS_V5T="${CROSS_DIR}"
+export CGTOOLS_V5T="${TOOLCHAIN_PATH}"
 export CC_V5T="bin/${TARGET_PREFIX}gcc"
-export CROSS_COMPILE = "${CROSS_DIR}/bin/${TARGET_PREFIX}"
+export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
 export MVTOOL_PREFIX="${TARGET_PREFIX}"
-export MVTOOL_DIR="${CROSS_DIR}"
+export MVTOOL_DIR="${TOOLCHAIN_PATH}"
 export CSTOOL_PREFIX="${TARGET_PREFIX}"
-export CSTOOL_DIR="${CROSS_DIR}"
+export CSTOOL_DIR="${TOOLCHAIN_PATH}"
 export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
 
 export CODEC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codecs"

diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc
index 8e9c89f..e330c73 100644 (file)
--- a/recipes/ti/ti-paths.inc
+++ b/recipes/ti/ti-paths.inc
@@ -12,7 +12,7 @@ require ti-multimedia-common.inc
 
 export PLATFORM
 
-export CROSS_COMPILE = "${CROSS_DIR}/bin/${TARGET_PREFIX}"
+export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
 
 # This tells codec engine which targets to build
 DEVICES ?= "DM6446"