ti-cmemk-module, ti-lpm-module: adapt build to release versions that fixed the weird stuff we worked around

4 files changed, 28 insertions, 19 deletions

diff --git a/packages/dsplink/lpm.inc b/packages/dsplink/lpm.inc
index 211ffd3766..7938268c52 100644
--- a/packages/dsplink/lpm.inc
+++ b/packages/dsplink/lpm.inc
@@ -3,8 +3,6 @@ DESCRIPTION = "Codec Engine for TI ARM/DSP processors - power module"
 DEPENDS = "virtual/kernel perl-native dsplink"
 RDEPENDS = "update-modules"
 
-inherit module
-
 require ti-paths.inc
 
 PARALLEL_MAKE = ""
@@ -13,22 +11,17 @@ do_compile_append() {
 	echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make		
 	echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make
 	echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}"  >> ${S}/Rules.make
+	export DSPLINK=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink
 
 	# Build the DSP power manager kernel module
-	cd ${S}/cetools/packages/ti/bios/power
-
-	# Unpack all kernel sources for the DSP power manager module
-	for dsp in $(ls | grep bld | awk -F, '{print $2}' | awk -F_ '{print $1}') ; do
-		if ! [ -e $dsp ] ; then tar xf ti_bios_power,${dsp}_bld.tar ; fi
-	done		
-	
-	cd ${DSPPOWERSOC}/lpm
-
-	unset LDFLAGS CFLAGS	
-	make   KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-           KERNEL_DIR=${STAGING_KERNEL_DIR}   \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
+	cd ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm
+
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	rm -f *o
+	make   KERNEL_PATH=${STAGING_KERNEL_DIR} \
+           KERNEL_SRC=${STAGING_KERNEL_DIR} \
+           KERNEL_DIR=${STAGING_KERNEL_DIR} \
+           KERNEL_VERSION=${KERNEL_VERSION} \
            TOOL_PREFIX=${TARGET_PREFIX} \
            DSPLINK_REPO=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ \
            CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
diff --git a/packages/dsplink/ti-cmemk-module_2.21.bb b/packages/dsplink/ti-cmemk-module_2.21.bb
index 0e9f733c8b..d15accb3ae 100644
--- a/packages/dsplink/ti-cmemk-module_2.21.bb
+++ b/packages/dsplink/ti-cmemk-module_2.21.bb
@@ -6,10 +6,16 @@ PV = "221"
 # md5sum
 # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html
 
+inherit module
+
 SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://Makefile.dsplink \
 "
 
 S = "${WORKDIR}/codec_engine_2_21"
 
+do_compile() {
+	:
+}
+
 require cmemk.inc
diff --git a/packages/dsplink/ti-lpm-module_2.21.bb b/packages/dsplink/ti-lpm-module_2.21.bb
index 9a9791894d..6a6945f710 100644
--- a/packages/dsplink/ti-lpm-module_2.21.bb
+++ b/packages/dsplink/ti-lpm-module_2.21.bb
@@ -9,7 +9,12 @@ PV = "221"
 SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://Makefile.dsplink \
           "
+inherit module
 
 S = "${WORKDIR}/codec_engine_2_21"
 
+do_compile() {
+	:
+}
+
 require lpm.inc
diff --git a/packages/dsplink/ti-paths.inc b/packages/dsplink/ti-paths.inc
index 4599c3ef73..7640d6b4fe 100644
--- a/packages/dsplink/ti-paths.inc
+++ b/packages/dsplink/ti-paths.inc
@@ -1,10 +1,15 @@
+# To build the DSP applications you need to have DSP/BIOS, xdctools and codegen installed. Get these from:
+# https://www-a.ti.com/downloads/sds_support/targetcontent/bios/bios_5_33/sabios-j05/bios_setuplinux_5_33_02.bin
+# https://www-a.ti.com/downloads/sds_support/targetcontent/rtsc/xdctools_3_10_03/exports/xdctools_setuplinux_3_10_03.bin
+# <url for codegen>
+
 # Path to the dir where the TI tools are unpacked
 TITOOLSDIR ?= "/OE/TI"
 # Path under TITOOLSDIR where dspbios is unpacked
-TIBIOSDIR ?= "bios_5_32_04"
-TIXDCTOOLSDIR ?= "${TITOOLSDIR}/xdctools_3_10_02"
+TIBIOSDIR ?= "bios_5_33_02"
+TIXDCTOOLSDIR ?= "${TITOOLSDIR}/xdctools_3_10_03"
 # Path under TITOOLSDIR where the dsp toolchain is unpacked
-TICGTOOLSDIR ?= "cg6x_6_0_19"
+TICGTOOLSDIR ?= "cg6x_6_0_16"
 
 DSPLINKPLATFORM ?= "DAVINCI"
 DSPLINKPLATFORM_omap5912osk = "OMAP"