ti dsp tools : Adding Framework components 2.25.00.04 ti dsp : Adding EDMA low level driver 1.11.00.02 ti-bios-utils: Add BIOSUTILS package 1.02.02 ti-codec-engine : 2.25.00.05 using lite-CE, i.e. without cetools dependency

 - improve installer to put dsp server executables next to arm apps
 - add runtime depends on cmem, dsplink modules
 - small tweaks for OMAPL138

ti-multimedia-common: Adding new paths for subcomponents
ti-dsplink-module: Adding suffix to track kernel version changes

angstrom: add infrastructure to set preferred versions for the codec-engine dependency chain

 - the DEFAULT_PREFERENCE approach didn't scale
 - add codec-engine 2.25.01 preferred versions and set as default

ti-xdais : adding recipe for v6.25.01.08
ti-codec-engine: remove 2.25.01, add 2.25.01.06
ti-framework-components: Add recipe for v2.25.01.05
ti-lpm: Renaming recipe to reflect component version instead of parent version
ti-multimedia-common: change path for separately staged lpm

ti recipes: remove bogus autotools defines

 - autotools.bbclass isn't used or needed here

ti-lpm-module: switch to TSPA release and fix versioning

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

1 files changed, 60 insertions, 13 deletions

diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc
index fee33a672f..28f5887542 100644
--- a/recipes/ti/ti-codec-engine.inc
+++ b/recipes/ti/ti-codec-engine.inc
@@ -3,13 +3,13 @@ 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"
+DEPENDS = "ti-framework-components ti-xdais-native ti-xdctools-native ti-cgt6x-native ti-biosutils-native ti-edma3lld-native"
 
 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"
 
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV}.tar.gz;name=cetarball"
+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"
 
 # Set the source directory
 S = "${WORKDIR}/codec_engine_${PV}"
@@ -32,10 +32,20 @@ CE_INSTALL_DIR = "${S}"
 
 do_compile () {
 
+	# No way to pass this via ENV?
 	sed -i  \
 		-e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \
 		${S}/examples/xdcpaths.mak
 
+	#only for ce 2.25.00.05
+	sed -i  \
+		-e 's/# figure out what categories of devices we are to build for/ \
+# figure out what categories of devices we are to build for \
+ifneq (,$(findstring OMAPL138,$(DEVICES))) \
+    DEVICES_DUALCPU := 1 \
+endif/g' \
+		${S}/examples/xdcpaths.mak
+
         for i in codecs extensions servers apps ; do
                 cd ${S}/examples/ti/sdo/ce/examples/$i
                 make DEVICES="${DEVICES}" \
@@ -43,14 +53,15 @@ do_compile () {
                      PROGRAMS="${PROGRAMS}" \
                      CE_INSTALL_DIR="${CE_INSTALL_DIR}" \
                      XDC_INSTALL_DIR="${XDCTOOLS_DIR}" \
-                     BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\
-                     DSPLINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
-                     XDAIS_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+                     BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}" \
+                     BIOSUTILS_INSTALL_DIR="${BIOSUTILS_INSTALL_DIR}" \
+		     DSPLINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
+                     XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \
                      FC_INSTALL_DIR="${FC_INSTALL_DIR}" \
                      CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \
-                     LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
-                     EDMA3_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
-                     CGTOOLS_V5T="${CROSS_DIR}"\
+                     LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \
+                     EDMA3_LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \
+                     CGTOOLS_V5T="${CROSS_DIR}" \
                      CGTOOLS_C64P="${CGT6x_DIR}" \
                      CGTOOLS_C674="${CGT6x_DIR}" \
                      clean all
@@ -58,21 +69,55 @@ do_compile () {
 }
 
 do_install() {
+
 	install -d ${D}/${installdir}/codec-engine-apps
 	cp ${S}/examples/apps/system_files/${DEVICES}/loadmodules.sh ${D}/${installdir}/codec-engine-apps
-	sed -i 's/insmod/modprobe/g' ${D}/${installdir}/codec-engine-apps/loadmodules.sh
+
+	# Only for 2.25.00.05
+	sed -i \
+		-e 's/insmod/modprobe/g' \
+		-e 's/.ko//g' \
+		${D}/${installdir}/codec-engine-apps/loadmodules.sh
 
 	cd ${S}/examples/ti/sdo/ce/examples
 
+	# Install the apps, servers and test data, mirroring the source directory structure
+	#  - Put the servers inside the same folder as the executable
+	#  - TODO - Check nested dirs (e.g. dualcpu_separateconfig)
+
+        # Put all servers in separate tree.
+        for i in $(find . -name "*.${DSPSUFFIX}"); do
+                install -d ${D}/${installdir}/codec-engine-apps/servers/`dirname ${i} | cut -f3 -d /`
+                install ${i} ${D}/${installdir}/codec-engine-apps/servers/`dirname ${i} | cut -f3 -d /`
+        done
+
 	for i in $(find . -name "*.xv5T"); do
 		install -d ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
 		install ${i} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
+	done
 
-    	for j in $(find . -name "*.${DSPSUFFIX}"); do
-		install ${j} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
-    	done
+	for i in $(find . -name "*.dat"); do
+		install -d ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
+		install ${i} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /`
+        done
 
-    done
+	# For each directory, softlink to the app server, except special cases
+	cd ${D}/${installdir}/codec-engine-apps
+	for i in $(find . -type d | grep -v servers); do
+		{
+		pwd
+		cd ${D}/${installdir}/codec-engine-apps/$i
+		if [ $(basename $i) == "audio1_ires" ] ; then 
+			ln -s ../servers/audio1_ires/audio1_ires.${DSPSUFFIX}
+		elif [ $(basename $i) == "server_api_example" ] ; then
+			ln -s ../servers/server_api_example/audio_copy.${DSPSUFFIX}
+                elif [ $(basename $i) != "." ] ; then
+			ln -s ../servers/all_codecs/all.${DSPSUFFIX}
+		else
+			echo Skipping $i
+		fi
+		}
+	done
 }
 
 
@@ -82,6 +127,8 @@ do_stage() {
     cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ 
 }
 
+RDEPENDS_ti-codec-engine-apps = "ti-cmem-module ti-dsplink-module"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 INHIBIT_PACKAGE_STRIP = "1"
 PACKAGES += "ti-codec-engine-apps"