ti recipes: start moving from -native to machine specific

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

1 files changed, 32 insertions, 29 deletions

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 () {