summaryrefslogtreecommitdiffstats
path: root/bsp/meta-ti/recipes-ti/includes
diff options
context:
space:
mode:
Diffstat (limited to 'bsp/meta-ti/recipes-ti/includes')
-rw-r--r--bsp/meta-ti/recipes-ti/includes/ti-paths.inc3
-rw-r--r--bsp/meta-ti/recipes-ti/includes/ti-unpack.inc7
2 files changed, 5 insertions, 5 deletions
diff --git a/bsp/meta-ti/recipes-ti/includes/ti-paths.inc b/bsp/meta-ti/recipes-ti/includes/ti-paths.inc
index 250074b4..52a93cf5 100644
--- a/bsp/meta-ti/recipes-ti/includes/ti-paths.inc
+++ b/bsp/meta-ti/recipes-ti/includes/ti-paths.inc
@@ -60,6 +60,8 @@ export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree"
export TI_CGT6X_7_INSTALL_DIR_RECIPE = "${installdir}/cgt6x-7"
export GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE = "${installdir}/gcc-linaro-baremetal"
export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE = "${installdir}/gcc-linaro-baremetal-aarch64"
+export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x"
+
# This is where the tools will end up in sysroot
export BIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${BIOS_INSTALL_DIR_RECIPE}"
@@ -113,6 +115,7 @@ export MPM_INSTALL_DIR = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}"
export TI_CGT6X_7_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT6X_7_INSTALL_DIR_RECIPE}"
export GCC_LINARO_BAREMETAL_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}"
export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}"
+export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}"
DSPSUFFIX_omapl137 = "x674"
diff --git a/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc b/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc
index dbc49491..828f3d5a 100644
--- a/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc
+++ b/bsp/meta-ti/recipes-ti/includes/ti-unpack.inc
@@ -20,11 +20,8 @@ python ti_bin_do_unpack() {
import os
# InstallJammer requires 32bit version of glibc
- lib32path = '/lib'
- if os.path.exists('/lib64') and (os.path.islink('/lib64') or os.path.islink('/lib') or os.path.exists('/lib32')):
- lib32path = '/lib32'
- if not os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('%s/i386-linux-gnu/libc.so.6' % lib32path):
- bb.warn("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on Ubuntu/Debian")
+ if not os.path.exists('/lib/ld-linux.so.2'):
+ bb.fatal("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on Ubuntu/Debian")
localdata = bb.data.createCopy(d)
bb.data.update_data(localdata)