Signed-off-by: Jacob Stiffler <[email protected]>
---
.../ti-tisdk-makefile/ti-tisdk-makefile/Rules.make | 2 +-
.../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
index bfee2fc..dcdd75f 100644
---
a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
+++
b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Rules.make
@@ -21,7 +21,7 @@ DESTDIR=__DESTDIR__
export LINUX_DEVKIT_PATH=$(TI_SDK_PATH)/linux-devkit
#Cross compiler prefix
-export
CROSS_COMPILE=$(LINUX_DEVKIT_PATH)/sysroots/__SDKMACHINE__-arago-linux/usr/bin/__TOOLCHAIN_PREFIX__
+export
CROSS_COMPILE=$(LINUX_DEVKIT_PATH)/sysroots/__SDKMACHINE__-arago-linux__TOOLCHAIN_BINDIR__/__TOOLCHAIN_PREFIX__
#Default CC value to be used when cross compiling. This is so that the
#GNU Make default of "cc" is not used to point to the host compiler
diff --git
a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 2601f80..2d10f4c 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -54,7 +54,7 @@ SRC_URI = "\
file://Makefile_pdm-anomaly-detection \
"
-PR = "r97"
+PR = "r98"
MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
refresh-screen \
@@ -228,6 +228,9 @@ AMSDK_DEFCONFIG = "singlecore-omap2plus_defconfig"
DEFCONFIG :=
"${@oe.utils.conditional('ARAGO_BRAND','amsdk','${AMSDK_DEFCONFIG}','${DEFCONFIG}',d)}"
+EXTERNAL_TOOLCHAIN_BINDIR = "/usr/bin"
+INTERNAL_TOOLCHAIN_BINDIR =
"/usr/bin/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+
# This step will stitch together the final Makefile based on the supported
# make targets.
do_install () {
@@ -302,6 +305,12 @@ do_install () {
sed -i -e "s/__CFLAGS__/${TARGET_CC_ARCH}/" ${D}/Rules.make
sed -i -e "s/__SDKMACHINE__/${SDKMACHINE}/" ${D}/Rules.make
+ if [ "${TOOLCHAIN_TYPE}" = "internal" ]; then
+ sed -i -e "s|__TOOLCHAIN_BINDIR__|${INTERNAL_TOOLCHAIN_BINDIR}|"
${D}/Rules.make
+ else
+ sed -i -e "s|__TOOLCHAIN_BINDIR__|${EXTERNAL_TOOLCHAIN_BINDIR}|"
${D}/Rules.make
+ fi
+
}
K3_UBOOT_MACHINE_R5 = ""
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
