From 8e0a8bd8f275b214d592467f662812bc3b6b5e18 Mon Sep 17 00:00:00 2001
From: Roger Monk <r-monk@ti.com>
Date: Fri, 18 Dec 2009 10:31:09 +0000
Subject: 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>
---
 recipes/ti/bitblit_svn.bb                        |  2 -
 recipes/ti/ti-biosutils-native_1.02.02.bb        | 16 ++++++
 recipes/ti/ti-biosutils.inc                      | 11 ++++
 recipes/ti/ti-cgt6x-native_6.0.21.bb             |  1 -
 recipes/ti/ti-cgt6x-native_6.1.9.bb              |  1 -
 recipes/ti/ti-codec-engine.inc                   | 73 +++++++++++++++++++-----
 recipes/ti/ti-codec-engine_2.25.00.05.bb         |  9 ++-
 recipes/ti/ti-codec-engine_2.25.01.06.bb         | 16 ++++++
 recipes/ti/ti-codec-engine_2.25.01.bb            | 11 ----
 recipes/ti/ti-dspbios-native.inc                 |  1 -
 recipes/ti/ti-dspbios-native_5.33.02.bb          |  1 -
 recipes/ti/ti-dsplink-module.inc                 |  4 ++
 recipes/ti/ti-edma3lld-native.inc                | 17 ++++++
 recipes/ti/ti-edma3lld-native_01.11.00.02.bb     | 16 ++++++
 recipes/ti/ti-edma3lld.inc                       |  8 +++
 recipes/ti/ti-framework-components.inc           |  2 +-
 recipes/ti/ti-framework-components_2.25.00.04.bb |  9 +++
 recipes/ti/ti-framework-components_2.25.01.05.bb | 12 ++++
 recipes/ti/ti-lpm-module_1.24.01.bb              | 50 ++++++++++++++++
 recipes/ti/ti-lpm-module_2.24.01.bb              | 40 -------------
 recipes/ti/ti-multimedia-common.inc              |  5 +-
 recipes/ti/ti-xdais-native_6.23.bb               |  1 -
 recipes/ti/ti-xdais-native_6.25.00.07.bb         |  1 -
 recipes/ti/ti-xdais-native_6.25.01.08.bb         | 15 +++++
 recipes/ti/ti-xdctools-native.inc                |  1 -
 25 files changed, 245 insertions(+), 78 deletions(-)
 create mode 100644 recipes/ti/ti-biosutils-native_1.02.02.bb
 create mode 100644 recipes/ti/ti-biosutils.inc
 create mode 100644 recipes/ti/ti-codec-engine_2.25.01.06.bb
 delete mode 100644 recipes/ti/ti-codec-engine_2.25.01.bb
 create mode 100644 recipes/ti/ti-edma3lld-native.inc
 create mode 100644 recipes/ti/ti-edma3lld-native_01.11.00.02.bb
 create mode 100644 recipes/ti/ti-edma3lld.inc
 create mode 100644 recipes/ti/ti-framework-components_2.25.01.05.bb
 create mode 100644 recipes/ti/ti-lpm-module_1.24.01.bb
 delete mode 100644 recipes/ti/ti-lpm-module_2.24.01.bb
 create mode 100644 recipes/ti/ti-xdais-native_6.25.01.08.bb

(limited to 'recipes/ti')

diff --git a/recipes/ti/bitblit_svn.bb b/recipes/ti/bitblit_svn.bb
index cc7dbf9a6b..4b87503faf 100644
--- a/recipes/ti/bitblit_svn.bb
+++ b/recipes/ti/bitblit_svn.bb
@@ -2,8 +2,6 @@ DESCRIPTION = "Low level 2D blitting/blending graphics acceleration services sup
 
 require ti-paths.inc
 
-inherit autotools
-
 DEPENDS = "ti-codec-engine ti-dmai"
 
 # Fetch source from svn repo
diff --git a/recipes/ti/ti-biosutils-native_1.02.02.bb b/recipes/ti/ti-biosutils-native_1.02.02.bb
new file mode 100644
index 0000000000..2181b1a3cc
--- /dev/null
+++ b/recipes/ti/ti-biosutils-native_1.02.02.bb
@@ -0,0 +1,16 @@
+require ti-biosutils.inc
+
+SRC_URI[biosutilstarball.md5sum] = "0654e9e72b0a6fc7a6575829c0cd90c9"
+SRC_URI[biosutilstarball.sha256sum] = "df486500bdc8dbe3800fc7efe4241e6fa5b1827ba7c0dc17a71b41d42ef921e1"
+
+PV = "1_02_02"
+PVsuffix = "_02"
+
+inherit native
+
+do_stage() {
+    install -d ${STAGING_DIR_NATIVE}/ti-biosutils
+    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-biosutils
+}
+
+
diff --git a/recipes/ti/ti-biosutils.inc b/recipes/ti/ti-biosutils.inc
new file mode 100644
index 0000000000..c06b20cb0f
--- /dev/null
+++ b/recipes/ti/ti-biosutils.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "TI DSP Algorithm Interface Standard specification"
+
+# Have a look at http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/index.html
+
+BASE_SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/Bios_Utils"
+
+SRC_URI = "${BASE_SRC_URI}/${PV}${PVsuffix}/exports/biosutils_${PV}.tar.gz;name=biosutilstarball"
+
+S = "${WORKDIR}/biosutils_${PV}"
+
+
diff --git a/recipes/ti/ti-cgt6x-native_6.0.21.bb b/recipes/ti/ti-cgt6x-native_6.0.21.bb
index f98ce63d6c..1913eb0272 100644
--- a/recipes/ti/ti-cgt6x-native_6.0.21.bb
+++ b/recipes/ti/ti-cgt6x-native_6.0.21.bb
@@ -18,5 +18,4 @@ do_stage() {
     cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
 
diff --git a/recipes/ti/ti-cgt6x-native_6.1.9.bb b/recipes/ti/ti-cgt6x-native_6.1.9.bb
index 9674e7699c..0005c6ee38 100644
--- a/recipes/ti/ti-cgt6x-native_6.1.9.bb
+++ b/recipes/ti/ti-cgt6x-native_6.1.9.bb
@@ -18,5 +18,4 @@ do_stage() {
     cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
 
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"
diff --git a/recipes/ti/ti-codec-engine_2.25.00.05.bb b/recipes/ti/ti-codec-engine_2.25.00.05.bb
index 9421aab614..6e67fd5b75 100644
--- a/recipes/ti/ti-codec-engine_2.25.00.05.bb
+++ b/recipes/ti/ti-codec-engine_2.25.00.05.bb
@@ -7,8 +7,13 @@ DEFAULT_PREFERENCE_omapl138 = "1"
 # tconf from xdctools dislikes '.' in pwd :/
 PV = "2_25_00_05"
 
-SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51"
-SRC_URI[cetarball.sha256sum] = "81f815159f3dfda0525be6da543644b02c3610bcb080df170cbd27e2d8420ba2"
+# Full-CE
+#SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51"
+#SRC_URI[cetarball.sha256sum] = "81f815159f3dfda0525be6da543644b02c3610bcb080df170cbd27e2d8420ba2"
+
+# Lite-CE
+SRC_URI[cetarball.md5sum] = "618f027c4a471a0658ed999621ac190b"
+SRC_URI[cetarball.sha256sum] = "81acdf9236f3062c26356db502837ae13addb35f03c02a847f9b0face9657b51"
 
 do_install_prepend() {
     ln -sf  ${S}/examples/apps/system_files/OMAPL137  ${S}/examples/apps/system_files/OMAPL138 || true
diff --git a/recipes/ti/ti-codec-engine_2.25.01.06.bb b/recipes/ti/ti-codec-engine_2.25.01.06.bb
new file mode 100644
index 0000000000..01d67739fb
--- /dev/null
+++ b/recipes/ti/ti-codec-engine_2.25.01.06.bb
@@ -0,0 +1,16 @@
+require ti-codec-engine.inc
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_omapl138 = "1"
+
+# tconf from xdctools dislikes '.' in pwd :/
+PV = "2_25_01_06"
+
+# Full-CE
+#SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51"
+#SRC_URI[cetarball.sha256sum] = "81f815159f3dfda0525be6da543644b02c3610bcb080df170cbd27e2d8420ba2"
+
+# Lite-CE
+SRC_URI[cetarball.md5sum] = "5874d84766beb2042afe0cdd3823fe9e"
+SRC_URI[cetarball.sha256sum] = "f155c27e4082f3dd79cf49511559e914d3792b82fd16caefc1739456ebec86ff"
+
diff --git a/recipes/ti/ti-codec-engine_2.25.01.bb b/recipes/ti/ti-codec-engine_2.25.01.bb
deleted file mode 100644
index a565ac9aec..0000000000
--- a/recipes/ti/ti-codec-engine_2.25.01.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require ti-codec-engine.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-PV = "2_25_00_01"
-PR = "r20"
-
-do_compile () {
-        echo "! Do not rebuild for now !"
-}
-
diff --git a/recipes/ti/ti-dspbios-native.inc b/recipes/ti/ti-dspbios-native.inc
index d9969f25d5..40f010433d 100644
--- a/recipes/ti/ti-dspbios-native.inc
+++ b/recipes/ti/ti-dspbios-native.inc
@@ -14,5 +14,4 @@ do_stage() {
     chmod 755 -R ${BIOS_INSTALL_DIR}/*
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL="1"
 
diff --git a/recipes/ti/ti-dspbios-native_5.33.02.bb b/recipes/ti/ti-dspbios-native_5.33.02.bb
index 4143c875da..ccb04b310f 100644
--- a/recipes/ti/ti-dspbios-native_5.33.02.bb
+++ b/recipes/ti/ti-dspbios-native_5.33.02.bb
@@ -17,5 +17,4 @@ do_stage() {
     cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ 
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL="1"
 
diff --git a/recipes/ti/ti-dsplink-module.inc b/recipes/ti/ti-dsplink-module.inc
index dda4e4a9e3..f6ad0b18d6 100644
--- a/recipes/ti/ti-dsplink-module.inc
+++ b/recipes/ti/ti-dsplink-module.inc
@@ -1,6 +1,10 @@
 DESCRIPTION = "DSPLINK module for TI ARM/DSP processors"
 
 require ti-paths.inc
+
+#This is a kernel module, don't set PR directly
+MACHINE_KERNEL_PR_append = "a"
+
 inherit module
 
 # compile and run time dependencies
diff --git a/recipes/ti/ti-edma3lld-native.inc b/recipes/ti/ti-edma3lld-native.inc
new file mode 100644
index 0000000000..8d2627ec5e
--- /dev/null
+++ b/recipes/ti/ti-edma3lld-native.inc
@@ -0,0 +1,17 @@
+require ti-paths.inc
+require ti-edma3lld.inc
+inherit native
+
+SRC_URI	= "http://something/EDMA3_LLD_setuplinux_${PV}.tar.gz;name=edma3lldtarball"
+#http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/edma3_lld/EDMA3-BIOS5-LLD/01_11/edma3_lld_01_11/EDMA3_LLD_setuplinux_${PV}.bin;name=edma3lldbin"
+
+#BINFILE="EDMA3_LLD_setuplinux_${PV}.bin"
+
+S = "${WORKDIR}/edma3_lld_${PV}"
+
+do_stage() {
+    install -d ${STAGING_DIR_NATIVE}/ti-edma3lld
+    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-edma3lld
+}
+
+
diff --git a/recipes/ti/ti-edma3lld-native_01.11.00.02.bb b/recipes/ti/ti-edma3lld-native_01.11.00.02.bb
new file mode 100644
index 0000000000..66fbf436d0
--- /dev/null
+++ b/recipes/ti/ti-edma3lld-native_01.11.00.02.bb
@@ -0,0 +1,16 @@
+require ti-edma3lld-native.inc
+
+#SRC_URI[edma3lldbin.md5sum] = "fa15c104cfe03227bf181ecf4094c0d9"
+#SRC_URI[edma3lldbin.sha256sum] = "9650d1fc8b441d46095a8b4e70dab5d7438351f38e03918d30bed0e4ffc50e66"
+
+SRC_URI[edma3lldtarball.md5sum] = "358c13c1c28c6074f1d340c4e8a9e5cf"
+SRC_URI[edma3lldtarball.sha256sum] = "5de884b0479390bc91dd83c23df2f742106cc001ac638849be276ba8be40bb7c"
+
+PV = "01_11_00_02"
+
+do_stage() {
+    install -d ${STAGING_DIR_NATIVE}/ti-edma3lld
+    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-edma3lld
+}
+
+
diff --git a/recipes/ti/ti-edma3lld.inc b/recipes/ti/ti-edma3lld.inc
new file mode 100644
index 0000000000..101dc7aaa1
--- /dev/null
+++ b/recipes/ti/ti-edma3lld.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "TI DSP/BIOS for Davinci and OMAP processor"
+
+TI_BIN_UNPK_CMDS="Y:workdir"
+
+#require ti-eula-unpack.inc
+
+PE = "1"
+
diff --git a/recipes/ti/ti-framework-components.inc b/recipes/ti/ti-framework-components.inc
index cd8a56193e..7f31014728 100644
--- a/recipes/ti/ti-framework-components.inc
+++ b/recipes/ti/ti-framework-components.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Framework Components for TI ARM/DSP processors"
 
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV}.tar.gz"
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball"
 
 require ti-paths.inc
 
diff --git a/recipes/ti/ti-framework-components_2.25.00.04.bb b/recipes/ti/ti-framework-components_2.25.00.04.bb
index 5ca4704364..77c8da32b1 100644
--- a/recipes/ti/ti-framework-components_2.25.00.04.bb
+++ b/recipes/ti/ti-framework-components_2.25.00.04.bb
@@ -2,4 +2,13 @@ require ti-framework-components.inc
 
 PV = "2_25_00_04"
 
+# Full-FC
+#SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51"
+#SRC_URI[cetarball.sha256sum] = "81f815159f3dfda0525be6da543644b02c3610bcb080df170cbd27e2d8420ba2"
+
+# Lite-FC
+SRC_URI[fctarball.md5sum] = "9b186aa6b431be08bd8b91926cd91c95"
+SRC_URI[fctarball.sha256sum] = "733737f5a0d0ca251993d8c7138378fb9481867a5d6c77ffa7d133673916c30f"
+
+
 
diff --git a/recipes/ti/ti-framework-components_2.25.01.05.bb b/recipes/ti/ti-framework-components_2.25.01.05.bb
new file mode 100644
index 0000000000..d851a13917
--- /dev/null
+++ b/recipes/ti/ti-framework-components_2.25.01.05.bb
@@ -0,0 +1,12 @@
+require ti-framework-components.inc
+
+PV = "2_25_01_05"
+
+# Full-FC
+#SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51"
+#SRC_URI[cetarball.sha256sum] = "81f815159f3dfda0525be6da543644b02c3610bcb080df170cbd27e2d8420ba2"
+
+# Lite-FC
+SRC_URI[fctarball.md5sum] = "50a50a328471cfacf11aeb071671038e"
+SRC_URI[fctarball.sha256sum] = "6c2a7bd8ed0d5f4be688b8fa5dd80d98e43f7327f54e9a758a04df0695ef15d8"
+
diff --git a/recipes/ti/ti-lpm-module_1.24.01.bb b/recipes/ti/ti-lpm-module_1.24.01.bb
new file mode 100644
index 0000000000..d5c277117e
--- /dev/null
+++ b/recipes/ti/ti-lpm-module_1.24.01.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "LPM module for TI OMAP3 processors"
+
+DEPENDS = "ti-linuxutils"
+
+# tconf breaks with '.' in PWD
+PV = "1_24_01"
+PE = "1"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/lpm/${PV}/exports/local_power_manager_linux_${PV}.tar.gz;name=lpmtarball"
+
+SRC_URI[lpmtarball.md5sum] = "6699861c8d0195654c539798ec428124"
+SRC_URI[lpmtarball.sha256sum] = "052b31b09e6d85bc1e980f5e3d2350019c2d8d7430d24db60854dc926df9a1f2"
+
+# Set the source directory
+S = "${WORKDIR}/local_power_manager_linux_${PV}"
+
+require ti-paths.inc
+
+#This is a kernel module, don't set PR directly
+MACHINE_KERNEL_PR_append = "a"
+
+inherit module
+
+do_compile () {
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    cd ${S}/packages/ti/bios/power/modules/${LPMDSPPOWERSOC}/lpm
+    make \
+      DSPLINK_REPO="${DSPLINK}/.." \
+      LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \
+      MVTOOL_PREFIX="${TARGET_PREFIX}" \
+      clean default
+}
+
+do_install () {
+    # LPM/CMEM/SDMA drivers - kernel modules
+    install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
+          install -m 0755 ${S}/packages/ti/bios/power/modules/${LPMDSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
+}
+
+# stage tree - other packages may need this
+do_stage() {
+    install -d ${LPM_INSTALL_DIR}
+    cp -pPrf ${S}/* ${LPM_INSTALL_DIR}
+}
+
+RDEPENDS_${PN} += " ti-dsplink-module"
+
+FILES_${PN} = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko"
+
+INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes/ti/ti-lpm-module_2.24.01.bb b/recipes/ti/ti-lpm-module_2.24.01.bb
deleted file mode 100644
index 32bc02b1e5..0000000000
--- a/recipes/ti/ti-lpm-module_2.24.01.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "LPM module for TI OMAP3 processors"
-
-DEPENDS = "ti-linuxutils"
-
-# tconf breaks with '.' in PWD
-PV = "2_24_01"
-
-SRC_URI = "http://install.source.dir.local/local_power_manager_1_24.tar.gz"
-
-# Set the source directory
-S = "${WORKDIR}/local_power_manager_1_24"
-
-require ti-paths.inc
-
-#This is a kernel module, don't set PR directly
-MACHINE_KERNEL_PR_append = "a"
-
-inherit module
-
-do_compile () {
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    cd ${S}/packages/ti/bios/power/modules/${LPMDSPPOWERSOC}/lpm
-    make \
-      DSPLINK_REPO="${DSPLINK}/.." \
-      LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \
-      MVTOOL_PREFIX="${TARGET_PREFIX}" \
-      clean default
-}
-
-do_install () {
-    # LPM/CMEM/SDMA drivers - kernel modules
-    install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
-          install -m 0755 ${S}/packages/ti/bios/power/modules/${LPMDSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
-}
-
-RDEPENDS_${PN} += " ti-dsplink-module"
-
-FILES_${PN} = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko"
-
-INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc
index b08838de18..1cfa679486 100644
--- a/recipes/ti/ti-multimedia-common.inc
+++ b/recipes/ti/ti-multimedia-common.inc
@@ -17,15 +17,16 @@ export CODEGEN_INSTALL_DIR    = "${STAGING_DIR_NATIVE}/ti-cgt6x-native"
 export XDC_INSTALL_DIR        = "${STAGING_DIR_NATIVE}/ti-xdctools-native"
 export XDAIS_INSTALL_DIR      = "${STAGING_DIR_NATIVE}/ti-xdais"
 export BIOS_INSTALL_DIR       = "${STAGING_DIR_NATIVE}/ti-dspbios-native"
+export BIOSUTILS_INSTALL_DIR  = "${STAGING_DIR_NATIVE}/ti-biosutils"
+export EDMA3_LLD_INSTALL_DIR  = "${STAGING_DIR_NATIVE}/ti-edma3lld"
 
 export CE_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine"
 export FC_INSTALL_DIR         = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-framework-components"
 export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
 export LINUXUTILS_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-linuxutils"
 export CMEM_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-linuxutils"
-#export LINK_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
 export LINK_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module"
-export LPM_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools"
+export LPM_INSTALL_DIR        = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-local-power-manager"
 export DMAI_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai"
 
 export USER_XDC_PATH    = "${CE_INSTALL_DIR}/examples"
diff --git a/recipes/ti/ti-xdais-native_6.23.bb b/recipes/ti/ti-xdais-native_6.23.bb
index 9cf839c139..751e4bd006 100644
--- a/recipes/ti/ti-xdais-native_6.23.bb
+++ b/recipes/ti/ti-xdais-native_6.23.bb
@@ -9,5 +9,4 @@ do_stage() {
     cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-xdais
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL="1"
 
diff --git a/recipes/ti/ti-xdais-native_6.25.00.07.bb b/recipes/ti/ti-xdais-native_6.25.00.07.bb
index 8733e2c125..19d2bdbc36 100644
--- a/recipes/ti/ti-xdais-native_6.25.00.07.bb
+++ b/recipes/ti/ti-xdais-native_6.25.00.07.bb
@@ -12,5 +12,4 @@ do_stage() {
     cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-xdais
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL="1"
 
diff --git a/recipes/ti/ti-xdais-native_6.25.01.08.bb b/recipes/ti/ti-xdais-native_6.25.01.08.bb
new file mode 100644
index 0000000000..cc71c48b5e
--- /dev/null
+++ b/recipes/ti/ti-xdais-native_6.25.01.08.bb
@@ -0,0 +1,15 @@
+require ti-xdais.inc
+
+SRC_URI[xdaisgz.md5sum] = "5f284e0721f4f080c9adc6271387c0f9"
+SRC_URI[xdaisgz.sha256sum] = "88866b1bbd3992141f47f7a672cd4a2fbeef729d582312a06a1f269a32dded88"
+
+PV = "6_25_01_08"
+
+inherit native
+
+do_stage() {
+    install -d ${STAGING_DIR_NATIVE}/ti-xdais
+    cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-xdais
+}
+
+
diff --git a/recipes/ti/ti-xdctools-native.inc b/recipes/ti/ti-xdctools-native.inc
index af6c9d7fc2..b58cc5dc14 100644
--- a/recipes/ti/ti-xdctools-native.inc
+++ b/recipes/ti/ti-xdctools-native.inc
@@ -11,5 +11,4 @@ do_stage() {
         chmod 755 -R  ${S}
 }
 
-AUTOTOOLS_NATIVE_STAGE_INSTALL="1"
 
-- 
cgit 1.2.3-korg