47 files changed, 973 insertions, 435 deletions
diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-dm365-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-dm365-rc.sh
new file mode 100644
index 0000000000..d95658e44b
--- /dev/null
+++ b/recipes/ti/gstreamer-ti/gstreamer-ti-dm365-rc.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# configure kernel modules for TI DSP based gstreamer plugin
+#
+
+# Disable XDM 0.9 elements
+export GST_TI_TIViddec_DISABLE=1
+export GST_TI_TIAuddec_DISABLE=1
+export GST_TI_TIVidenc_DISABLE=1
+export GST_TI_TIImgdec_DISABLE=1
+export GST_TI_TIImgenc_DISABLE=1
+
+load_module() {
+    # CMEM Allocation
+    #    1x3628800 Circular buffer
+    #    4x829440  Video buffers (max D1 PAL)
+    #    1x829440  Underlying software components (codecs, etc.)
+    #    1x518400  Underlying software components (codecs, etc.)
+    #    1x4948    Underlying software components (codecs, etc.)
+    #    1x1505280 Underlying software components (codecs, etc.)
+    #    1x5760    Underlying software components (codecs, etc.)
+    #    1x8192    Underlying software components (codecs, etc.)
+    #    1x1       Dummy buffer used during final flush
+    modprobe cmemk phys_start=0x87400000 phys_end=0x88000000 \
+        pools=1x3628800,5x829440,1x518400,1x4948,1x1505280,1x5760,1x8192,1x1
+
+    modprobe dm350mmap
+    rm -f /dev/dm350mmap
+    mknod /dev/dm350mmap c `awk "\\$2==\"dm350mmap\" {print \\$1}" /proc/devices` 0
+
+}
+
+unload_module() {
+   rmmod cmemk
+   rmmod dm350mmap
+}
+
+case "$1" in
+      start) 
+             echo -n "Loading kernel modules for gstreamer-ti... "
+             load_module
+             echo "  done"
+             ;;
+       stop) 
+             echo -n "Unloading kernel module ..."
+             unload_module
+             echo "   done"
+             ;;
+        restart) 
+             echo -n "Unloading kernel module ..."
+             unload_module
+             echo "   done"
+             echo -n "Loading kernel modules for gstreamer-ti... "
+             load_module
+             echo "  done"
+             ;;
+        *)
+             echo "$0 <start/stop/restart>"
+             ;;
+esac
+
diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-rc.sh
new file mode 100644
index 0000000000..69468977bd
--- /dev/null
+++ b/recipes/ti/gstreamer-ti/gstreamer-ti-dm6467-rc.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# configure kernel modules for TI DSP based gstreamer plugin
+#
+
+# Disable XDM 0.9 elements
+export GST_TI_TIViddec_DISABLE=1
+export GST_TI_TIAuddec_DISABLE=1
+export GST_TI_TIVidenc_DISABLE=1
+export GST_TI_TIImgdec_DISABLE=1
+export GST_TI_TIImgenc_DISABLE=1
+
+load_module() {
+    # insert cmemk, tell it to occupy physical 118MB-128MB.
+    #
+    # CMEM Allocation
+    #    1x5250000 Circular buffer
+    #    2x829440  Video buffers (max D1 PAL)
+    #    3x1036800 Video buffers (larger size needed for MPEG4 encoder)
+    #    1x8192    Underlying software components (codecs, etc.)
+    #    1x1       Dummy buffer used during final flush
+    modprobe cmemk phys_start=0x87600000 phys_end=0x88000000 \
+        pools=1x5250000,2x829440,3x1036800,1x8192,1x1
+
+    # Notes on using the "playbin" element:
+    # -------------------------------------
+    #    Playbin requires one 6 video buffers, and we have only allocated five.
+    #    If you replace the "2x829440,3x1036800" with "6x829440" it should work, but
+    #    you will not be able to use the MPEG4 encoder.
+    #
+    #insmod cmemk.ko phys_start=0x87600000 phys_end=0x88000000 \
+    #    pools=1x5250000,6x829440,1x8192,1x1
+
+    # insert dsplinkk
+    modprobe dsplinkk
+
+    # make /dev/dsplink
+    rm -f /dev/dsplink
+    mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
+}
+
+unload_module() {
+   rmmod cmemk
+   rmmod dsplinkk
+   rm -f /dev/dsplink
+}
+
+case "$1" in
+      start) 
+             echo -n "Loading kernel modules for gstreamer-ti... "
+             load_module
+             echo "  done"
+             ;;
+       stop) 
+             echo -n "Unloading kernel module ..."
+             unload_module
+             echo "   done"
+             ;;
+        restart) 
+             echo -n "Unloading kernel module ..."
+             unload_module
+             echo "   done"
+             echo -n "Loading kernel modules for gstreamer-ti... "
+             load_module
+             echo "  done"
+             ;;
+        *)
+             echo "$0 <start/stop/restart>"
+             ;;
+esac
+
diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-omapl137-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-omapl137-rc.sh
new file mode 100644
index 0000000000..353758b3a7
--- /dev/null
+++ b/recipes/ti/gstreamer-ti/gstreamer-ti-omapl137-rc.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# configure kernel modules for TI DSP based gstreamer plugin
+#
+
+# Disable XDM 0.9 elements
+export GST_TI_TIViddec_DISABLE=1
+export GST_TI_TIAuddec_DISABLE=1
+export GST_TI_TIVidenc_DISABLE=1
+export GST_TI_TIImgdec_DISABLE=1
+export GST_TI_TIImgenc_DISABLE=1
+
+load_module() {
+    # insert cmemk, tell it to occupy physical 34MB-64MB.
+    #
+    modprobe cmemk phys_start=0xC2200000 phys_end=0xC3200000 \
+        pools=1x5250000,3x1048576,3x829440,1x256000,4x131072
+
+    modprobe dsplinkk
+
+    rm -f /dev/dsplink
+    mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
+}
+
+unload_module() {
+   rmmod cmemk
+   rmmod dsplinkk
+   rm -f /dev/dsplink
+}
+
+case "$1" in
+      start) 
+             echo -n "Loading kernel modules for gstreamer-ti... "
+             load_module
+             echo "  done"
+             ;;
+       stop) 
+             echo -n "Unloading kernel module ..."
+             unload_module
+             echo "   done"
+             ;;
+        restart) 
+             echo -n "Unloading kernel module ..."
+             unload_module
+             echo "   done"
+             echo -n "Loading kernel modules for gstreamer-ti... "
+             load_module
+             echo "  done"
+             ;;
+        *)
+             echo "$0 <start/stop/restart>"
+             ;;
+esac
+
diff --git a/recipes/ti/files/gstreamer-ti-tracker-824.patch b/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch
index 634fa4aaf6..634fa4aaf6 100644
--- a/recipes/ti/files/gstreamer-ti-tracker-824.patch
+++ b/recipes/ti/gstreamer-ti/gstreamer-ti-tracker-824.patch
diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb
index 1b60d40577..1ac37166c7 100644
--- a/recipes/ti/gstreamer-ti_svn.bb
+++ b/recipes/ti/gstreamer-ti_svn.bb
@@ -1,17 +1,34 @@
-DESCRIPTION = "Gstreamer plugin for TI Davinci and OMAP processors"
+DESCRIPTION = "GSTREAMER Plugin (gstreamer-ti) for TI ARM/DSP processors"
+HOMEPAGE = "https://gforge.ti.com/gf/project/gstreamer_ti/"
 SECTION = "multimedia"
 
-DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly"
+# TODO :: Replace omapl137 with official support in GST (currently linking to omapl138)
+# TODO :: Codec Server Environment Variables shouldn't be required
+# TODO :: Add (and check) rc scripts for all targets (just copied for now) (365,6467,omapl137)
+# TODO :: Check if CPPFLAGS_append is still required
+
+inherit autotools
+inherit update-rc.d
+
+require ti-paths.inc
+require ti-staging.inc
+
+PROVIDES += "gstreamer-ti-demo-script"
 
-SRCREV = "573"
-# Again, no '.' in PWD allowed :(
 PV = "svnr${SRCREV}"
-PR = "r43"
+PR = "r45"
+
+S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin"
 
-GST_TI_RC_SCRIPT_omap3 = "gstreamer-ti-omap3530-rc.sh"
-GST_TI_RC_SCRIPT_dm6446="gstreamer-ti-dm6446-rc.sh"
-GST_TI_RC_SCRIPT_dm355="gstreamer-ti-dm355-rc.sh"
-GST_TI_RC_SCRIPT_omapl138="gstreamer-ti-omapl138-rc.sh"
+GST_TI_RC_SCRIPT_dm6446   = "gstreamer-ti-dm6446-rc.sh"
+GST_TI_RC_SCRIPT_dm6467   = "gstreamer-ti-dm6467-rc.sh"
+GST_TI_RC_SCRIPT_omap3    = "gstreamer-ti-omap3530-rc.sh"
+GST_TI_RC_SCRIPT_dm355    = "gstreamer-ti-dm355-rc.sh"
+GST_TI_RC_SCRIPT_dm365    = "gstreamer-ti-dm365-rc.sh"
+GST_TI_RC_SCRIPT_omapl137 = "gstreamer-ti-omapl137-rc.sh"
+GST_TI_RC_SCRIPT_omapl138 = "gstreamer-ti-omapl138-rc.sh"
+
+SRCREV = "573"
 
 SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \
            file://gstreamer-ti-tracker-462.patch;patch=1 \
@@ -23,72 +40,113 @@ SRC_URI_append_omap3 = " \
            file://gstreamer-ti-add-omapfb.patch;patch=1 \
 "
 
-SRC_URI_append_omapl138 = " \
+SRC_URI_append_omapl137 = " \
            file://gstreamer-ti-omapl138.patch;patch=1 \
 "
 
-S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin"
+SRC_URI_append_omapl138 = " \
+           file://gstreamer-ti-omapl138.patch;patch=1 \
+"
 
-inherit autotools update-rc.d
+DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly"
 
-require ti-paths.inc
+# gstreamer_ti picks up some config variables from the environment
+# - variables are used in the gstreamer makefile
+#   - PLATFORM, XDC_PLATFORM, XDC_TARGET, MVTOOL_DIR  
+# - others used by config.bld (which it gets from the dmai config.bld)
+#   - CROSS_COMPILE, PLATFORM_XDC
+
+PLATFORM_dm6446        = "dm6446"
+PLATFORM_dm6467        = "dm6467"
+PLATFORM_omap3         = "omap3530"
+PLATFORM_dm355         = "dm355"
+PLATFORM_dm365         = "dm365"
+PLATFORM_omapl137      = "omapl138"
+PLATFORM_omapl138      = "omapl138"
+PLATFORM              ?= "<UNDEFINED_PLATFORM>"
+
+XDC_PLATFORM_dm6446    = "ti.platforms.evmDM6446"
+XDC_PLATFORM_dm6467    = "ti.platforms.evmDM6467"
+XDC_PLATFORM_omap3     = "ti.platforms.evm3530"
+XDC_PLATFORM_dm355     = "ti.platforms.evmDM355"
+XDC_PLATFORM_dm365     = "ti.platforms.evmDM365"
+XDC_PLATFORM_omapl137  = "ti.platforms.evmOMAPL138"
+XDC_PLATFORM_omapl138  = "ti.platforms.evmOMAPL138"
+XDC_PLATFORM          ?= "<UNDEFINED_XDC_PLATFORM>"
+
+export PLATFORM
+export XDC_PLATFORM
+export XDC_TARGET      = "gnu.targets.arm.GCArmv5T"
+export PLATFORM_XDC    = ${XDC_PLATFORM}
+export MVTOOL_DIR      = "${TOOLCHAIN_PATH}"
+export CROSS_COMPILE   = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
 
-XDC_TARGET = "gnu.targets.arm.GCArmv5T"
-XDC_PLATFORM_dm6446 = "ti.platforms.evmDM6446"
-XDC_PLATFORM_omapl137 = "ti.platforms.evmOMAPL137"
-XDC_PLATFORM_omapl138 = "ti.platforms.evmOMAPL138"
-PLATFORM_XDC = "${XDC_PLATFORM}"
-PLATFORM_dm6446 = "dm6446"
-PLATFORM_omapl137 = "omapl137"
-PLATFORM_omapl138 = "omapl138"
+# Makefile also expects to be able to find the kernel headers from the envirionment
+export LINUXKERNEL_INSTALL_DIR = ${STAGING_KERNEL_DIR} 
 
-export XDC_TARGET
-export XDC_PLATFORM
-export PLATFORM_XDC
 # export codec combo (or server) locations
-export HMJCP_COMBO  = "${installdir}/codec-combo/hmjcp.accel"
-export CODEC_SERVER = "${installdir}/codec-combo/cs.x64P"
-export ENCODE_COMBO = "${installdir}/codec-combo/encodeCombo.x64P"
-export DECODE_COMBO = "${installdir}/codec-combo/decodeCombo.x64P"
+# Why do we need to do this?? - These will get picked up from CODEC_INSTALL_DIR?
+# Sould only need this if we change from default server
+
+export HMJCP_COMBO     = "${installdir}/ti-codecs-server/hmjcp.accel"
+export CODEC_SERVER    = "${installdir}/ti-codecs-server/cs.x64P"
+export ENCODE_COMBO    = "${installdir}/ti-codecs-server/encodeCombo.x64P"
+export DECODE_COMBO    = "${installdir}/ti-codecs-server/decodeCombo.x64P"
 
 CPPFLAGS_append = " -DPlatform_${PLATFORM}"
 
 do_configure_prepend() {
-	sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/src/Makefile.am
+    sed -i -e 's:(LINK_INSTALL_DIR)/packages:(LINK_INSTALL_DIR):g' ${S}/src/Makefile.am
+
+    # TODO :: Is this still true?
+    # 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
+         sed -i -e s:linux/omapfb:mach/omapfb:g ${S}/src/omapfb.h || true
+    fi
 }
 
 do_install_prepend () {
-        # install gstreamer demo scripts
-        install -d ${D}/${installdir}/gst
-        cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/shared ${D}/${installdir}/gst
-        if [ -d ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ] ; then
-            cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst
-            # default loadmodule script is hard-coded for insmod, change to modprobe
-            sed -i 's/insmod/modprobe/g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh
-            sed -i 's/.ko//g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh
-            if [ "${PLATFORM}" = "omap3530" ]; then
-                    echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh
-            fi
+
+    # install gstreamer demo scripts
+    install -d ${D}/${installdir}/gst
+    cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/shared ${D}/${installdir}/gst
+
+    if [ -d ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ] ; then
+        cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst
+        
+        # default loadmodules script is hard-coded for insmod, change to modprobe
+        sed -i 's/insmod/modprobe/g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh
+        sed -i 's/.ko//g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh
+
+        if [ "${PLATFORM}" = "omap3530" ]; then
+            echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh
         fi
-        chmod 0755 ${D}/${installdir}/gst -R
-        install -d ${D}${sysconfdir}/init.d/
-        install -m 0755  ${WORKDIR}/${GST_TI_RC_SCRIPT} ${D}${sysconfdir}/init.d/gstti-init
+    fi
+
+    chmod 0755 ${D}/${installdir}/gst -R
+    install -d ${D}${sysconfdir}/init.d/
+    install -m 0755  ${WORKDIR}/${GST_TI_RC_SCRIPT} ${D}${sysconfdir}/init.d/gstti-init
 }
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGES += "gstreamer-ti-demo-script"
+RRECOMMENDS_${PN}_append_dm6446    += "ti-codecs-dm6446-server   ti-cmem-module ti-dsplink-module"
+RRECOMMENDS_${PN}_append_dm6467    += "ti-codecs-dm6467          ti-cmem-module ti-dsplink-module"
+RRECOMMENDS_${PN}_append_omap3     += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module"
+RRECOMMENDS_${PN}_append_dm355     += "ti-codecs-dm355           ti-cmem-module ti-dm355mm-module"
+RRECOMMENDS_${PN}_append_dm365     += "ti-codecs-dm365           ti-cmem-module ti-dm365mm-module"
+RRECOMMENDS_${PN}_append_omapl137  += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module"
+RRECOMMENDS_${PN}_append_omapl138  += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module"
 
-RDEPENDS_gstreamer-ti-demo-script = "${PN}"
+FILES_${PN}     += "${libdir}/gstreamer-0.10/*.so ${sysconfdir}"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
 
-RRECOMMENDS_${PN}_append_omap3 = " ti-codecs-omap3530 ti-sdma-module ti-cmem-module ti-lpm-module ti-dsplink-module"
+PACKAGES += "gstreamer-ti-demo-script"
+RDEPENDS_gstreamer-ti-demo-script = "${PN}"
 
 FILES_gstreamer-ti-demo-script = "${installdir}/gst/*"
-FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${sysconfdir}"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
 
 pkg_postinst_gstreamer-ti-demo-script () {
-        ln -sf ${installdir}/codec-combo/* ${installdir}/gst/${PLATFORM}/
+        ln -sf ${installdir}/ti-codecs-server/* ${installdir}/gst/${PLATFORM}/
 }
 
 INITSCRIPT_NAME = "gstti-init"
diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc
index fc68a3305f..dc5294a927 100644
--- a/recipes/ti/ti-codec-engine.inc
+++ b/recipes/ti/ti-codec-engine.inc
@@ -1,58 +1,104 @@
 DESCRIPTION = "Codec Engine for TI ARM/DSP processors"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce"
 SECTION = "devel"
 
+# TODO :: Add Codec Engine Library Rebuild
+# TODO :: Add Examples APP_LOCAL build as well?
+# TODO :: Check DEPENDS - are the DSP side packages required for ARM-only products?
+
 require ti-paths.inc
+require ti-staging.inc
 
-# compile time dependencies
-DEPENDS = "ti-framework-components ti-xdais ti-xdctools ti-cgt6x ti-biosutils ti-edma3lld ti-linuxutils"
+PROVIDES += "ti-codec-engine-examples"
+
+PR = "r3"
+
+S = "${WORKDIR}/codec_engine_${PV}"
+
+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"
 
+DEPENDS = "ti-framework-components ti-xdais ti-xdctools ti-cgt6x ti-biosutils ti-edma3lld ti-linuxutils"
 DEPENDS_append_dm6446 	= " ti-dspbios ti-dsplink ti-local-power-manager"
 DEPENDS_append_dm6467 	= " ti-dspbios ti-dsplink"
 DEPENDS_append_omap3   	= " ti-dspbios ti-dsplink ti-local-power-manager"
+DEPENDS_append_omapl137 = " ti-dspbios ti-dsplink"
 DEPENDS_append_omapl138 = " ti-dspbios ti-dsplink"
 
-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"
+# SOC_FAMILY configuration
+
+# Define DEVICES variable
+CEEXAMPLESDEVICES_dm6446     = "DM6446"
+CEEXAMPLESDEVICES_dm6467     = "DM6467"
+CEEXAMPLESDEVICES_omap3      = "OMAP3530"
+CEEXAMPLESDEVICES_dm355      = "DM355"
+CEEXAMPLESDEVICES_dm365      = "DM365"
+CEEXAMPLESDEVICES_omapl137   = "OMAPL137"
+CEEXAMPLESDEVICES_omapl138   = "OMAPL138"
+CEEXAMPLESDEVICES           ?= "<UNDEFINED_CEEXAMPLESDEVICES>"
+
+# Define GPPOS variable
+CEEXAMPLESGPPOS_dm6446       = "LINUX_GCC"
+CEEXAMPLESGPPOS_dm6467       = "LINUX_GCC"
+CEEXAMPLESGPPOS_omap3        = "LINUX_GCC"
+CEEXAMPLESGPPOS_dm355        = "LINUX_GCC"
+CEEXAMPLESGPPOS_dm365        = "LINUX_GCC"
+CEEXAMPLESGPPOS_omapl137     = "LINUX_GCC"
+CEEXAMPLESGPPOS_omapl138     = "LINUX_GCC"
+CEEXAMPLESGPPOS             ?= "<UNDEFINED_CEEXAMPLESGPPOS>"
+
+# Define PROGRAM variable
+CEEXAMPLESPROGRAMS_dm6446    = "APP_CLIENT DSP_SERVER"
+CEEXAMPLESPROGRAMS_dm6467    = "APP_CLIENT DSP_SERVER"
+CEEXAMPLESPROGRAMS_omap3     = "APP_CLIENT DSP_SERVER"
+CEEXAMPLESPROGRAMS_dm355     = "APP_LOCAL"
+CEEXAMPLESPROGRAMS_dm365     = "APP_LOCAL"
+CEEXAMPLESPROGRAMS_omapl137  = "APP_CLIENT DSP_SERVER"
+CEEXAMPLESPROGRAMS_omapl138  = "APP_CLIENT DSP_SERVER"
+CEEXAMPLESPROGRAMS          ?= "<UNDEFINED_CEEXAMPLESPROGRAMS>"
+
+do_configure() {
+
+    # No way to pass this via ENV?
+    sed -i  \
+        -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \
+        ${S}/examples/xdcpaths.mak
+}
 
-# Set the source directory
-S = "${WORKDIR}/codec_engine_${PV}"
+do_prepsources() {
 
-# Define Device variable
-DEVICES           = ""
-DEVICES_dm6446 	 ?= "DM6446"
-DEVICES_dm6467   ?= "DM6467"
-DEVICES_omap3    ?= "OMAP3530"
-DEVICES_dm355    ?= "DM355"
-DEVICES_dm365    ?= "DM365"
-DEVICES_omapl137 ?= "OMAPL137"
-DEVICES_omapl138 ?= "OMAPL138"
-
-# Need to set this for other platforms as well
-GPPOS_dm355      = "LINUX_GCC"
-
-#define PROGRAM variables
-#TODO - should we build APP_LOCAL for SOCs as well?? - probably?
-PROGRAMS         ?= "APP_CLIENT DSP_SERVER"
-PROGRAMS_dm355    = "APP_LOCAL"
-PROGRAMS_dm365    = "APP_LOCAL"
-
-CGT6x_DIR = "${CODEGEN_INSTALL_DIR}"
-XDCTOOLS_DIR = "${XDC_INSTALL_DIR}"
-CE_INSTALL_DIR = "${S}"
+        for i in codecs extensions servers apps ; do
+                cd ${S}/examples/ti/sdo/ce/examples/$i
+                make DEVICES="${CEEXAMPLESDEVICES}" \
+                     GPPOS="${CEEXAMPLESGPPOS}" \
+                     PROGRAMS="${CEEXAMPLESPROGRAMS}" \
+                     CE_INSTALL_DIR="${S}" \
+                     XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \
+                     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="${LPM_INSTALL_DIR}" \
+                     EDMA3_LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \
+                     CGTOOLS_V5T="${TOOLCHAIN_PATH}" \
+                     CGTOOLS_C64P="${CODEGEN_INSTALL_DIR}" \
+                     CGTOOLS_C674="${CODEGEN_INSTALL_DIR}" \
+                     clean
+        done
+}
 
-do_compile () {
+addtask prepsources after do_configure before do_compile
 
-	# No way to pass this via ENV?
-	sed -i  \
-		-e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \
-		${S}/examples/xdcpaths.mak
+do_compile () {
 
         for i in codecs extensions servers apps ; do
                 cd ${S}/examples/ti/sdo/ce/examples/$i
-                make DEVICES="${DEVICES}" \
-                     GPPOS="${GPPOS}" \
-                     PROGRAMS="${PROGRAMS}" \
-                     CE_INSTALL_DIR="${CE_INSTALL_DIR}" \
-                     XDC_INSTALL_DIR="${XDCTOOLS_DIR}" \
+                make DEVICES="${CEEXAMPLESDEVICES}" \
+                     GPPOS="${CEEXAMPLESGPPOS}" \
+                     PROGRAMS="${CEEXAMPLESPROGRAMS}" \
+                     CE_INSTALL_DIR="${S}" \
+                     XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \
                      BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}" \
                      BIOSUTILS_INSTALL_DIR="${BIOSUTILS_INSTALL_DIR}" \
 		     DSPLINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
@@ -62,17 +108,17 @@ do_compile () {
                      LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \
                      EDMA3_LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \
                      CGTOOLS_V5T="${TOOLCHAIN_PATH}" \
-                     CGTOOLS_C64P="${CGT6x_DIR}" \
-                     CGTOOLS_C674="${CGT6x_DIR}" \
-                     clean all
+                     CGTOOLS_C64P="${CODEGEN_INSTALL_DIR}" \
+                     CGTOOLS_C674="${CODEGEN_INSTALL_DIR}" \
+                     all
         done
 }
 
 do_install() {
 
-	install -d ${D}/${installdir}/codec-engine-apps
-	if [-e ${S}/examples/apps/system_files/${DEVICES}/loadmodules.sh ]; then
-		cp ${S}/examples/apps/system_files/${DEVICES}/loadmodules.sh ${D}/${installdir}/codec-engine-apps
+	install -d ${D}/${installdir}/ti-codec-engine-examples
+	if [ -e ${S}/examples/apps/system_files/${CEEXAMPLESDEVICES}/loadmodules.sh ]; then
+		cp ${S}/examples/apps/system_files/${CEEXAMPLESDEVICES}/loadmodules.sh ${D}/${installdir}/ti-codec-engine-examples
 	fi
 
 	cd ${S}/examples/ti/sdo/ce/examples
@@ -83,26 +129,26 @@ do_install() {
 
         # 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 /`
+                install -d ${D}/${installdir}/ti-codec-engine-examples/servers/`dirname ${i} | cut -f3 -d /`
+                install ${i} ${D}/${installdir}/ti-codec-engine-examples/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 /`
+		install -d ${D}/${installdir}/ti-codec-engine-examples/`dirname ${i} | cut -f3 -d /`
+		install ${i} ${D}/${installdir}/ti-codec-engine-examples/`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 /`
+		install -d ${D}/${installdir}/ti-codec-engine-examples/`dirname ${i} | cut -f3 -d /`
+		install ${i} ${D}/${installdir}/ti-codec-engine-examples/`dirname ${i} | cut -f3 -d /`
         done
 
 	# For each directory, softlink to the app server, except special cases
-	cd ${D}/${installdir}/codec-engine-apps
+	cd ${D}/${installdir}/ti-codec-engine-examples
 	for i in $(find . -type d | grep -v servers); do
 		{
 		pwd
-		cd ${D}/${installdir}/codec-engine-apps/$i
+		cd ${D}/${installdir}/ti-codec-engine-examples/$i
 		if [ $(basename $i) == "audio1_ires" ] ; then 
 			ln -s ../servers/audio1_ires/audio1_ires.${DSPSUFFIX}
 		elif [ $(basename $i) == "server_api_example" ] ; then
@@ -115,20 +161,19 @@ do_install() {
 		}
 	done
 
-    # Stage the complete tree as well
-    install -d ${D}${CE_INSTALL_DIR_RECIPE}
-    cp -pPrf ${S}/* ${D}${CE_INSTALL_DIR_RECIPE}
+        # Install/Stage the Source Tree
+        install -d ${D}${CE_INSTALL_DIR_RECIPE}
+        cp -pPrf ${S}/* ${D}${CE_INSTALL_DIR_RECIPE}
 }
 
-require ti-staging.inc
-
-RDEPENDS_ti-codec-engine-apps = "ti-cmem-module"
-RDEPENDS_append_dm6446   = " ti-dsplink-module"
-RDEPENDS_append_omap3    = " ti-dsplink-module"
-RDEPENDS_append_omapl138 = " ti-dsplink-module"
+PACKAGES += "ti-codec-engine-examples"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGES += "ti-codec-engine-apps"
-FILES_ti-codec-engine-apps = "${installdir}/codec-engine-apps/*"
-INSANE_SKIP_ti-codec-engine-apps = True
+RDEPENDS_ti-codec-engine-examples                 = " ti-cmem-module"
+RDEPENDS_ti-codec-engine-examples_append_dm6446   = " ti-dsplink-module ti-lpm-module"
+RDEPENDS_ti-codec-engine-examples_append_dm6467   = " ti-dsplink-module"
+RDEPENDS_ti-codec-engine-examples_append_omap3    = " ti-dsplink-module ti-lpm-module"
+RDEPENDS_ti-codec-engine-examples_append_omapl137 = " ti-dsplink-module"
+RDEPENDS_ti-codec-engine-examples_append_omapl138 = " ti-dsplink-module"
+FILES_ti-codec-engine-examples = "${installdir}/ti-codec-engine-examples/*"
+INSANE_SKIP_ti-codec-engine-examples = True
 
diff --git a/recipes/ti/ti-codec-engine_2.24.01.bb b/recipes/ti/ti-codec-engine_2.24.01.bb
deleted file mode 100644
index 03385ede83..0000000000
--- a/recipes/ti/ti-codec-engine_2.24.01.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ti-codec-engine.inc
-
-# tconf from xdctools dislikes '.' in pwd :/
-PR = "r7"
-PV = "2_24_01"
-
-SRC_URI = "http://install.source.dir.local/codec_engine_2_24_01.tar.gz "
-
-# Set the source directory
-S = "${WORKDIR}/codec_engine_2_24_01"
-
-
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 e903df359c..726e92fe32 100644
--- a/recipes/ti/ti-codec-engine_2.25.00.05.bb
+++ b/recipes/ti/ti-codec-engine_2.25.00.05.bb
@@ -2,11 +2,6 @@ require ti-codec-engine.inc
 
 PV = "2_25_00_05"
 
-# Full-CE
-#SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51"
-#SRC_URI[cetarball.sha256sum] = "81f815159f3dfda0525be6da543644b02c3610bcb080df170cbd27e2d8420ba2"
-
-# Lite-CE
 SRC_URI[cetarball.md5sum] = "618f027c4a471a0658ed999621ac190b"
 SRC_URI[cetarball.sha256sum] = "81acdf9236f3062c26356db502837ae13addb35f03c02a847f9b0face9657b51"
 
diff --git a/recipes/ti/ti-codec-engine_2.25.01.06.bb b/recipes/ti/ti-codec-engine_2.25.01.06.bb
index 21c5a0eea2..2677889e4f 100644
--- a/recipes/ti/ti-codec-engine_2.25.01.06.bb
+++ b/recipes/ti/ti-codec-engine_2.25.01.06.bb
@@ -1,20 +1,7 @@
 require ti-codec-engine.inc
 
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_omapl138 = "1"
-DEFAULT_PREFERENCE_dm355 = "1"
-DEFAULT_PREFERENCE_dm365 = "1"
-DEFAULT_PREFERENCE_dm6467 = "1"
-
-# tconf from xdctools dislikes '.' in pwd :/
 PV = "2_25_01_06"
-PR = "r2"
-
-# 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-codecs-dm6446_2.05.00.00.bb b/recipes/ti/ti-codecs-dm6446_2.05.00.00.bb
new file mode 100644
index 0000000000..0331b21f37
--- /dev/null
+++ b/recipes/ti/ti-codecs-dm6446_2.05.00.00.bb
@@ -0,0 +1,88 @@
+DESCRIPTION = "TI Codecs (and Server Combo) for DM6446"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent"
+SECTION = "multimedia"
+
+# TODO :: Move to common .inc (omap3 and omapl ready)
+# TODO :: XDCARGS = eval in this server?
+
+PV = "2_05_00_00"
+
+SRC_URI[dm6446codecsbin.md5sum] = "4db567252e6c43119e1c0aafe401a679"
+SRC_URI[dm6446codecsbin.sha256sum] = "e042e1aad42a6728adf5c955dc38e4f8331fc0eacd833f1cd75d9cbb4faff0b5"
+
+PR = "r17"
+
+require ti-paths.inc
+require ti-staging.inc
+require ti-eula-unpack.inc
+
+PROVIDES += "ti-codecs-dm6446-server"
+
+S = "${WORKDIR}/dvsdk_2_00_00_22/dm6446_dvsdk_combos_2_05"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin;name=dm6446codecsbin"
+
+BINFILE = "dm6446_codecs_setuplinux_2_00_00_22.bin"
+TI_BIN_UNPK_CMDS = "Y: qY:workdir:Y"
+
+DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
+
+#generic codec
+DSPSUFFIX_dm6446 = "x64P"
+
+do_prepsources() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="eval" \
+             clean
+}
+
+addtask prepsources after do_configure before do_compile
+
+do_compile() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="eval" \
+             all
+}
+
+do_install() {
+
+    install -d ${D}/${installdir}/ti-codecs-server
+    cd ${S}
+
+    # Install the DSP Server Binary 
+    for file in `find . -name *.${DSPSUFFIX}`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    # Install docs (codec qualiTI test reports, server config datasheet, etc)
+    for file in `find . -name *.html`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    install -d ${D}${CODEC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE}
+}
+
+PACKAGES += "ti-codecs-dm6446-server"
+FILES_ti-codecs-dm6446-server = "${installdir}/ti-codecs-server/*"
+
diff --git a/recipes/ti/ti-codecs-dm6446_2.05.bb b/recipes/ti/ti-codecs-dm6446_2.05.bb
deleted file mode 100644
index 63a57fef8f..0000000000
--- a/recipes/ti/ti-codecs-dm6446_2.05.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-DEPENDS="ti-codec-engine ti-linuxutils"
-
-require ti-codec.inc
-
-SRC_URI	= "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin"
-
-S = "${WORKDIR}/dvsdk_2_00_00_22/dm6446_dvsdk_combos_2_05"
-BINFILE = "dm6446_codecs_setuplinux_2_00_00_22.bin"
-TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
-
-require ti-eula-unpack.inc
-
-export ${CODEGEN_INSTALL_DIR}
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "205"
-PR = "r15"
-
-do_configure () {
-	find . -name *.x64P | xargs rm -rf {} 
-}
-
-do_compile() {
-	make BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
-		XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
-		CE_INSTALL_DIR=${CE_INSTALL_DIR} \
-		FC_INSTALL_DIR=${FC_INSTALL_DIR} \
-		CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
-		XDAIS_INSTALL_DIR=${XDAIS_INSTALL_DIR} \
-		LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
-		CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
-		XDCARGS=\"eval\"
-}
-
-do_install () {
-    install -d ${D}/${installdir}/codec-combo
-	cd ${S}
-	for file in `find . -name *.x64P`; do
-		cp ${file} ${D}/${installdir}/codec-combo
-	done
-}
-
diff --git a/recipes/ti/ti-codecs-omap3530_1.00.01.44.bb b/recipes/ti/ti-codecs-omap3530_1.00.01.44.bb
index 6b31f26734..55295b347a 100644
--- a/recipes/ti/ti-codecs-omap3530_1.00.01.44.bb
+++ b/recipes/ti/ti-codecs-omap3530_1.00.01.44.bb
@@ -1,57 +1,87 @@
-require ti-codec.inc
+DESCRIPTION = "TI Codecs (and Server Combo) for OMAP3530"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent"
+SECTION = "multimedia"
 
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/3_00_02_44/exports/cs1omap3530_setuplinux_1_00_01-44.bin;name=cs1omaptarball"
+# TODO :: Move to common .inc (omap3 and omapl ready)
 
-SRC_URI[cs1omaptarball.md5sum] = "4db567252e6c43119e1c0aafe401a679"
-SRC_URI[cs1omaptarball.sha256sum] = "e042e1aad42a6728adf5c955dc38e4f8331fc0eacd833f1cd75d9cbb4faff0b5"
+PV = "1_00_01_44"
 
-# Specify names of the InstallJammer binary file and the tarball it extracts
-BINFILE = "cs1omap3530_setuplinux_1_00_01-44.bin"
-TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
+SRC_URI[omap3codecsbin.md5sum] = "4db567252e6c43119e1c0aafe401a679"
+SRC_URI[omap3codecsbin.sha256sum] = "e042e1aad42a6728adf5c955dc38e4f8331fc0eacd833f1cd75d9cbb4faff0b5"
 
+PR = "r7"
+
+require ti-paths.inc
+require ti-staging.inc
 require ti-eula-unpack.inc
 
+PROVIDES += "ti-codecs-omap3530-server"
+RREPLACES_${PN} = "ti-cs1-omap3530"
+
 S = "${WORKDIR}/dvsdk_3_00_02_44/cs1omap3530_1_00_01"
 
-DEPENDS="ti-codec-engine ti-linuxutils"
-RREPLACES_${PN} = "ti-cs1-omap3530"
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/3_00_02_44/exports/cs1omap3530_setuplinux_1_00_01-44.bin;name=omap3codecsbin"
 
-export CODEGEN_INSTALL_DIR
+BINFILE = "cs1omap3530_setuplinux_1_00_01-44.bin"
+TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
 
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "1_00_01_44"
-PR = "r6"
+DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
+
+#generic codec
+DSPSUFFIX_omap3 = "x64P"
+
+do_prepsources() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             clean
+}
+
+addtask prepsources after do_configure before do_compile
 
 do_compile() {
 
-	make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
-		 FC_INSTALL_DIR=${FC_INSTALL_DIR} \
-		 LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
-		 CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
-		 LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
-	     BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
-		 CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
-		 XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
-		 CODEC_INSTALL_DIR="${S}" \
-		 XDCARGS="prod" \
-		 clean
-
-	make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
-		 FC_INSTALL_DIR=${FC_INSTALL_DIR} \
-		 LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
-		 CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
-		 LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
-	     BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
-		 CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
-		 XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
-		 CODEC_INSTALL_DIR="${S}" \
-		 XDCARGS="prod" \
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             all
 }
 
-do_install () {
-    install -d ${D}/${installdir}/codec-combo
-	cd ${S}
-	for file in `find . -name *.x64P`; do
-		cp ${file} ${D}/${installdir}/codec-combo
-	done
+do_install() {
+
+    install -d ${D}/${installdir}/ti-codecs-server
+    cd ${S}
+
+    # Install the DSP Server Binary 
+    for file in `find . -name *.${DSPSUFFIX}`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    # Install docs (codec qualiTI test reports, server config datasheet, etc)
+    for file in `find . -name *.html`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    install -d ${D}${CODEC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE}
 }
+
+PACKAGES += "ti-codecs-omap3530-server"
+FILES_ti-codecs-omap3530-server = "${installdir}/ti-codecs-server/*"
diff --git a/recipes/ti/ti-codecs-omapl137_1.0.bb b/recipes/ti/ti-codecs-omapl137_1.0.bb
deleted file mode 100644
index 1cb87cd248..0000000000
--- a/recipes/ti/ti-codecs-omapl137_1.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require ti-codec.inc
-
-# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation.
-SRC_URI	= "http://install.source.dir.local/omapl137_dvsdk_combos_1_0.tar.gz"
-
-S = "${WORKDIR}/omapl137_dvsdk_combos_1_0"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "1_0"
-PR = "r1"
-
-do_compile() {
-	echo "do nothing"
-}
-
-do_install () {
-    install -d ${D}/${installdir}/codec-combo
-	cd ${S}
-	for file in `find . -name *.${DSPSUFFIX}`; do
-		cp ${file} ${D}/${installdir}/codec-combo
-	done
-}
-
diff --git a/recipes/ti/ti-codecs-omapl137_1.00.00.bb b/recipes/ti/ti-codecs-omapl137_1.00.00.bb
new file mode 100644
index 0000000000..0fd564c96a
--- /dev/null
+++ b/recipes/ti/ti-codecs-omapl137_1.00.00.bb
@@ -0,0 +1,89 @@
+DESCRIPTION = "TI Codecs (and Server Combo) for OMAPL137"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent"
+SECTION = "multimedia"
+
+# TODO :: Move to common .inc (omap3 and omapl ready)
+
+PV = "1_00_00"
+
+# This is invalid checksum
+SRC_URI[l137codecsbin.md5sum] = "64a53cd55bc63d3a6f4db742aff90de9"
+SRC_URI[l137codecsbin.sha256sum] = "4fb1075ad83f6017616410eff35ada7d567f1ee1b5b23624a817e8fc7dda3f8a"
+
+PR = "r2"
+
+require ti-paths.inc
+require ti-staging.inc
+require ti-eula-unpack.inc
+
+PROVIDES += "ti-codecs-omapl137-server"
+
+S = "${WORKDIR}/omapl137_dvsdk_combos_1_0"
+
+SRC_URI = "http://install.source.dir.local/omapl137_dvsdk_combos_1_0.tar.gz;name=l137codecsbin"
+
+#BINFILE = "cs1omapl138_${PV}-v2_setup_linux.bin"
+#TI_BIN_UNPK_CMDS = "y:Y: qY:workdir"
+
+DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
+
+#generic codec
+DSPSUFFIX_omapl137 = "x64P"
+
+do_prepsources() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             clean
+}
+
+addtask prepsources after do_configure before do_compile
+
+do_compile() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             all
+}
+
+do_install() {
+
+    install -d ${D}/${installdir}/ti-codecs-server
+    cd ${S}
+
+    # Install the DSP Server Binary 
+    for file in `find . -name *.${DSPSUFFIX}`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    # Install docs (codec qualiTI test reports, server config datasheet, etc)
+    for file in `find . -name *.html`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    install -d ${D}${CODEC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE}
+}
+
+PACKAGES += "ti-codecs-omapl137-server"
+FILES_ti-codecs-omapl137-server = "${installdir}/ti-codecs-server/*"
+
+
diff --git a/recipes/ti/ti-codecs-omapl138_1.0.bb b/recipes/ti/ti-codecs-omapl138_1.0.bb
deleted file mode 100644
index 491bf937dd..0000000000
--- a/recipes/ti/ti-codecs-omapl138_1.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require ti-codec.inc
- 
-# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation.
-SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/sdk/omap_l138/1_00/latest/exports/${BINFILE};name=l138codecs"
-
-SRC_URI[l138codecs.md5sum] = "64a53cd55bc63d3a6f4db742aff90de9"
-SRC_URI[l138codecs.sha256sum] = "4fb1075ad83f6017616410eff35ada7d567f1ee1b5b23624a817e8fc7dda3f8a"
-
-require ti-eula-unpack.inc
-
-# Specify names of the InstallJammer binary file and the tarball it extracts
-BINFILE = "cs1omapl138_${PV}-v2_setup_linux.bin"
-TI_BIN_UNPK_CMDS = "y:Y: qY:workdir"
-
-S = "${WORKDIR}/OMAP_L138_arm_${PV}_08/cs1omapl138_${PV}"
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "1_00_00"
-PR = "r2"
-
-do_compile() {
-	echo "do nothing"
-}
-
-#generic codec
-DSPSUFFIX_omapl138 = "x64P"
-
-do_install () {
-    install -d ${D}/${installdir}/codec-combo
-	cd ${S}
-	for file in `find . -name *.${DSPSUFFIX}`; do
-		cp ${file} ${D}/${installdir}/codec-combo
-	done
-}
-
diff --git a/recipes/ti/ti-codecs-omapl138_1.00.00.bb b/recipes/ti/ti-codecs-omapl138_1.00.00.bb
new file mode 100644
index 0000000000..66f41cd92a
--- /dev/null
+++ b/recipes/ti/ti-codecs-omapl138_1.00.00.bb
@@ -0,0 +1,88 @@
+DESCRIPTION = "TI Codecs (and Server Combo) for OMAPL138"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent"
+SECTION = "multimedia"
+
+# TODO :: Move to common .inc (omap3 and omapl ready)
+
+PV = "1_00_00"
+
+SRC_URI[l138codecsbin.md5sum] = "64a53cd55bc63d3a6f4db742aff90de9"
+SRC_URI[l138codecsbin.sha256sum] = "4fb1075ad83f6017616410eff35ada7d567f1ee1b5b23624a817e8fc7dda3f8a"
+
+PR = "r3"
+
+require ti-paths.inc
+require ti-staging.inc
+require ti-eula-unpack.inc
+
+PROVIDES += "ti-codecs-omapl138-server"
+
+S = "${WORKDIR}/OMAP_L138_arm_1_00_00_08/cs1omapl138_${PV}"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/sdk/omap_l138/1_00/latest/exports/${BINFILE};name=l138codecsbin"
+
+BINFILE = "cs1omapl138_${PV}-v2_setup_linux.bin"
+TI_BIN_UNPK_CMDS = "y:Y: qY:workdir"
+
+DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
+
+#generic codec
+DSPSUFFIX_omapl138 = "x64P"
+
+do_prepsources() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             clean
+}
+
+addtask prepsources after do_configure before do_compile
+
+do_compile() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             all
+}
+
+do_install() {
+
+    install -d ${D}/${installdir}/ti-codecs-server
+    cd ${S}
+
+    # Install the DSP Server Binary 
+    for file in `find . -name *.${DSPSUFFIX}`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    # Install docs (codec qualiTI test reports, server config datasheet, etc)
+    for file in `find . -name *.html`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    install -d ${D}${CODEC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE}
+}
+
+PACKAGES += "ti-codecs-omapl138-server"
+FILES_ti-codecs-omapl138-server = "${installdir}/ti-codecs-server/*"
+
+
diff --git a/recipes/ti/files/dmai-built-with-angstrom.patch b/recipes/ti/ti-dmai/dmai-built-with-angstrom.patch
index fc49789718..fc49789718 100644
--- a/recipes/ti/files/dmai-built-with-angstrom.patch
+++ b/recipes/ti/ti-dmai/dmai-built-with-angstrom.patch
diff --git a/recipes/ti/files/dmai-do-not-panic-on-mixer-failure.patch b/recipes/ti/ti-dmai/dmai-do-not-panic-on-mixer-failure.patch
index 20e1aece72..20e1aece72 100644
--- a/recipes/ti/files/dmai-do-not-panic-on-mixer-failure.patch
+++ b/recipes/ti/ti-dmai/dmai-do-not-panic-on-mixer-failure.patch
diff --git a/recipes/ti/files/dmai-support-32bit-align.patch b/recipes/ti/ti-dmai/dmai-support-32bit-align.patch
index 0ee817d9d9..0ee817d9d9 100644
--- a/recipes/ti/files/dmai-support-32bit-align.patch
+++ b/recipes/ti/ti-dmai/dmai-support-32bit-align.patch
diff --git a/recipes/ti/files/dmai-update-cpu-name.patch b/recipes/ti/ti-dmai/dmai-update-cpu-name.patch
index 052a8e3236..052a8e3236 100644
--- a/recipes/ti/files/dmai-update-cpu-name.patch
+++ b/recipes/ti/ti-dmai/dmai-update-cpu-name.patch
diff --git a/recipes/ti/files/dmai-update-fb-display.patch b/recipes/ti/ti-dmai/dmai-update-fb-display.patch
index 91c1dd15aa..91c1dd15aa 100644
--- a/recipes/ti/files/dmai-update-fb-display.patch
+++ b/recipes/ti/ti-dmai/dmai-update-fb-display.patch
diff --git a/recipes/ti/files/dmai-update-v4l2-display.patch b/recipes/ti/ti-dmai/dmai-update-v4l2-display.patch
index 8bb77d8473..8bb77d8473 100644
--- a/recipes/ti/files/dmai-update-v4l2-display.patch
+++ b/recipes/ti/ti-dmai/dmai-update-v4l2-display.patch
diff --git a/recipes/ti/files/loadmodules-ti-dmai-apps.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-apps.sh
index 7120b74483..7120b74483 100755
--- a/recipes/ti/files/loadmodules-ti-dmai-apps.sh
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-apps.sh
diff --git a/recipes/ti/files/loadmodules-ti-dmai-dm355_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm355_al.sh
index ca357e2095..ca357e2095 100755
--- a/recipes/ti/files/loadmodules-ti-dmai-dm355_al.sh
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm355_al.sh
diff --git a/recipes/ti/files/loadmodules-ti-dmai-dm365_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm365_al.sh
index 921c924b9a..921c924b9a 100644
--- a/recipes/ti/files/loadmodules-ti-dmai-dm365_al.sh
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm365_al.sh
diff --git a/recipes/ti/files/loadmodules-ti-dmai-dm6446_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm6446_al.sh
index b4a230d590..b4a230d590 100755
--- a/recipes/ti/files/loadmodules-ti-dmai-dm6446_al.sh
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm6446_al.sh
diff --git a/recipes/ti/files/loadmodules-ti-dmai-dm6467_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm6467_al.sh
index b4a230d590..b4a230d590 100755
--- a/recipes/ti/files/loadmodules-ti-dmai-dm6467_al.sh
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-dm6467_al.sh
diff --git a/recipes/ti/files/loadmodules-ti-dmai-o3530_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-o3530_al.sh
index 076af07223..076af07223 100755
--- a/recipes/ti/files/loadmodules-ti-dmai-o3530_al.sh
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-o3530_al.sh
diff --git a/recipes/ti/files/loadmodules-ti-dmai-ol138_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-ol137_al.sh
index 2c98c7871a..2c98c7871a 100755
--- a/recipes/ti/files/loadmodules-ti-dmai-ol138_al.sh
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-ol137_al.sh
diff --git a/recipes/ti/ti-dmai/loadmodules-ti-dmai-ol138_al.sh b/recipes/ti/ti-dmai/loadmodules-ti-dmai-ol138_al.sh
new file mode 100755
index 0000000000..2c98c7871a
--- /dev/null
+++ b/recipes/ti/ti-dmai/loadmodules-ti-dmai-ol138_al.sh
@@ -0,0 +1,19 @@
+#
+# loadmodules.sh
+#
+# Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation version 2.1 of the License.
+#
+# This program is distributed #as is# WITHOUT ANY WARRANTY of any kind,
+# whether express or implied; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+modprobe cmemk phys_start=0xC2200000 phys_end=0xC3200000 pools=1x5250000,3x1048576,3x829440,1x256000,4x131072
+modprobe dsplinkk
+
+rm -rf /dev/dsplink
+mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
diff --git a/recipes/ti/files/unloadmodules-ti-dmai-apps.sh b/recipes/ti/ti-dmai/unloadmodules-ti-dmai-apps.sh
index 793d727f39..793d727f39 100644
--- a/recipes/ti/files/unloadmodules-ti-dmai-apps.sh
+++ b/recipes/ti/ti-dmai/unloadmodules-ti-dmai-apps.sh
diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb
index 4c6a2c1257..dbfcfeaa00 100644
--- a/recipes/ti/ti-dmai_svn.bb
+++ b/recipes/ti/ti-dmai_svn.bb
@@ -1,154 +1,186 @@
-DESCRIPTION = "DMAI for TI ARM/DSP processors"
+DESCRIPTION = "Davinci Multimedia Application Interface (DMAI) for TI ARM/DSP processors"
+HOMEPAGE = "https://gforge.ti.com/gf/project/dmai/"
 SECTION = "multimedia"
 
+# TODO :: 
+
 require ti-paths.inc
 require ti-staging.inc
-inherit module-base
 
-#This is a kernel module, don't set PR directly
-MACHINE_KERNEL_PR_append = "e"
+PROVIDES += "ti-dmai-apps ti-dmai-tests"
 
-# Yes, the xdc stuff still breaks with a '.' in PWD
 PE = "1"
 PV = "1.0+svnr${SRCPV}"
 
-BRANCH = "branches/BRANCH_BRIJESH_DMAI_DEV_2_xx"
-BRANCH_omapl138 = "trunk"
-BRANCH_omapl137 = "trunk"
-BRANCH_dm6467 = "branches/GITPSP_INT_101009"
-BRANCH_dm355 = "branches/GITPSP_INT_101009"
-BRANCH_dm365 = "branches/GITPSP_INT_101009"
-BRANCH_omap3 = "trunk"
-
-SRCREV = "423"
-SRCREV_dm6467 = "424"
-SRCREV_dm355 = "424"
-SRCREV_dm365 = "424"
-
-SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${BRANCH};proto=https;user=anonymous;pswd='' \
-		file://loadmodules-ti-dmai-dm355_al.sh \
-		file://loadmodules-ti-dmai-dm365_al.sh \
+# This package has high dependence on kernel, use kernel PR as base and append a local version
+PR = "${MACHINE_KERNEL_PR}"
+PR_append = "f"
+
+S = "${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface"
+
+DMAIBRANCH_dm6446     = "trunk"
+DMAIBRANCH_dm6467     = "branches/GITPSP_INT_101009"
+DMAIBRANCH_omap3      = "trunk"
+DMAIBRANCH_dm355      = "branches/GITPSP_INT_101009"
+DMAIBRANCH_dm365      = "branches/GITPSP_INT_101009"
+DMAIBRANCH_omapl137   = "trunk"
+DMAIBRANCH_omapl138   = "trunk"
+DMAIBRANCH           ?= "<UNDEFINED_DMAIBRANCH>"
+
+SRCREV_dm6446         = "423"
+SRCREV_dm6467         = "424"
+SRCREV_omap3          = "423"
+SRCREV_dm355          = "424"
+SRCREV_dm365          = "424"
+SRCREV_omapl137       = "423"
+SRCREV_omapl138       = "423"
+SRCREV               ?= "<UNDEFINED_SRCREV>"
+
+SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${DMAIBRANCH};proto=https;user=anonymous;pswd='' \
 		file://loadmodules-ti-dmai-dm6446_al.sh \
 		file://loadmodules-ti-dmai-dm6467_al.sh \
 		file://loadmodules-ti-dmai-o3530_al.sh \
+		file://loadmodules-ti-dmai-dm355_al.sh \
+		file://loadmodules-ti-dmai-dm365_al.sh \
+		file://loadmodules-ti-dmai-ol137_al.sh \
 		file://loadmodules-ti-dmai-ol138_al.sh \
 	"
 
-S = "${WORKDIR}/${BRANCH}/davinci_multimedia_application_interface"
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-# compile time dependencies
-DEPENDS = "alsa-lib ti-framework-components ti-codec-engine ti-xdctools"
+DEPENDS = "virtual/kernel alsa-lib ti-framework-components ti-codec-engine ti-xdctools"
 
-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_dm6467 	= " ti-dspbios ti-cgt6x ti-codecs-dm6467 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 ti-cgt6x ti-codecs-omapl137 virtual/kernel ti-linuxutils"
-DEPENDS_append_omapl138 = " ti-dspbios ti-cgt6x ti-codecs-omapl138 virtual/kernel ti-linuxutils"
+DEPENDS_append_dm6446 	= " ti-codecs-dm6446   ti-dspbios ti-cgt6x ti-linuxutils"
+DEPENDS_append_dm6467 	= " ti-codecs-dm6467   ti-dspbios ti-cgt6x ti-linuxutils"
+DEPENDS_append_omap3    = " ti-codecs-omap3530 ti-dspbios ti-cgt6x ti-linuxutils"
+DEPENDS_append_dm355  	= " ti-codecs-dm355"
+DEPENDS_append_dm365    = " ti-codecs-dm365"
+DEPENDS_append_omapl137 = " ti-codecs-omapl137 ti-dspbios ti-cgt6x ti-linuxutils"
+DEPENDS_append_omapl138 = " ti-codecs-omapl138 ti-dspbios ti-cgt6x ti-linuxutils"
 
 # Define DMAI build time variables
-TARGET_omap3     = "o3530_al"
-TARGET_dm6446    = "dm6446_al"
-TARGET_dm6467    = "dm6467_al"
-TARGET_omapl137 = "ol137_al"
-TARGET_omapl138 = "ol138_al"
-TARGET_dm355     = "dm355_al"
-TARGET_dm365     = "dm365_al"
-TARGET          ?= "all"
+DMAIPLATFORM_dm6446    = "dm6446_al"
+DMAIPLATFORM_dm6467    = "dm6467_al"
+DMAIPLATFORM_omap3     = "o3530_al"
+DMAIPLATFORM_dm355     = "dm355_al"
+DMAIPLATFORM_dm365     = "dm365_al"
+DMAIPLATFORM_omapl137  = "ol137_al"
+DMAIPLATFORM_omapl138  = "ol138_al"
+DMAIPLATFORM          ?= "<UNDEFINED_DMAIPLATFORM>"
 
 # Need to set this for other platforms as well
-GPPOS_dm355      = "LINUX_GCC"
-GPPOS_dm365      = "LINUX_GCC"
+#GPPOS_dm355      = "LINUX_GCC"
+#GPPOS_dm365      = "LINUX_GCC"
+#GPPOS           ?= "<UNDEFINEDGPPOS>"
 
+# This is needed for dm355/dm365 targets in order to find ti.sdo.codecs.g711
+# TODO :: review - should we just pass this in do_compile?
 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 
+    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
 
+    # TODO :: Is this still true?
+    # 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 
         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
 }
 
+do_prepsources() {
+
+    # TODO :: Why do we do this?
+    unset DMAI_INSTALL_DIR
+    cd ${S}
+    make XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" PLATFORM="${DMAIPLATFORM}" clean
+}
+
+addtask prepsources after do_configure before do_compile
 
 do_compile () {
 
-	unset DMAI_INSTALL_DIR
-	cd ${S}
-	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_TARGET}/usr" \
-			USER_XDC_PATH="${USER_XDC_PATH}" \
-			CROSS_COMPILE="${TOOLCHAIN_PATH}/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}" 
+    # TODO :: Why do we do this?
+    unset DMAI_INSTALL_DIR
+    cd ${S}
+
+    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_INSTALL_DIR}" \
+            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_TARGET}/usr" \
+            USER_XDC_PATH="${USER_XDC_PATH}" \
+            CROSS_COMPILE="${TOOLCHAIN_PATH}/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="${DMAIPLATFORM}" 
 	done
 }
 
 do_install () {
+
+    # TODO :: Why do we do this?
     unset DMAI_INSTALL_DIR
-    # install dmai apps on target
-    install -d ${D}/${installdir}/dmai-apps
+
+    install -d ${D}/${installdir}/ti-dmai-apps
     cd ${S}/dmai
-    make PLATFORM="${TARGET}" EXEC_DIR=${D}/${installdir}/dmai-apps install 
-    install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${TARGET}.sh ${D}/${installdir}/dmai-apps/loadmodule.sh 
+    make PLATFORM="${DMAIPLATFORM}" EXEC_DIR=${D}/${installdir}/ti-dmai-apps install 
+    install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${DMAIPLATFORM}.sh ${D}/${installdir}/ti-dmai-apps/loadmodules.sh 
 
-    install -d ${D}/${installdir}/dmai-tests
+    install -d ${D}/${installdir}/ti-dmai-tests
     cd ${S}/tests
-    make PLATFORM="${TARGET}" EXEC_DIR=${D}/${installdir}/dmai-tests install 
-    install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${TARGET}.sh ${D}/${installdir}/dmai-tests/loadmodule.sh 
+    make PLATFORM="${DMAIPLATFORM}" EXEC_DIR=${D}/${installdir}/ti-dmai-tests install 
+    install -m 0755 ${WORKDIR}/loadmodules-ti-dmai-${DMAIPLATFORM}.sh ${D}/${installdir}/ti-dmai-tests/loadmodules.sh 
 
     install -d ${D}${DMAI_INSTALL_DIR_RECIPE}
     cp -pPrf ${S}/dmai/* ${D}${DMAI_INSTALL_DIR_RECIPE}
 }
 
+PACKAGES += "ti-dmai-apps"
+FILES_ti-dmai-apps = "${installdir}/ti-dmai-apps/*"
+INSANE_SKIP_ti-dmai-apps = True
+
+RDEPENDS_ti-dmai-apps_dm6446    += "ti-codecs-dm6446-server   ti-cmem-module ti-dsplink-module"
+RDEPENDS_ti-dmai-apps_dm6467    += "ti-codecs-dm6467          ti-cmem-module ti-dsplink-module"
+RDEPENDS_ti-dmai-apps_omap3     += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module"
+RDEPENDS_ti-dmai-apps_dm355     += "ti-codecs-dm355           ti-cmem-module ti-dm355mm-module"
+RDEPENDS_ti-dmai-apps_dm365     += "ti-codecs-dm365           ti-cmem-module ti-dm365mm-module"
+RDEPENDS_ti-dmai-apps_omapl137  += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module"
+RDEPENDS_ti-dmai-apps_omapl138  += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module"
+
 pkg_postinst_ti-dmai-apps () {
-	ln -sf ${installdir}/codec-combo/* ${installdir}/dmai-apps/
+	ln -sf ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ${installdir}/ti-dmai-apps/
 }
 
-# Disable QA check untils we figure out how to pass LDFLAGS in build
-INSANE_SKIP_${PN} = True
-INSANE_SKIP_ti-dmai-apps = True
+PACKAGES += "ti-dmai-tests"
+FILES_ti-dmai-tests = "${installdir}/ti-dmai-tests/*"
 INSANE_SKIP_ti-dmai-tests = True
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-INHIBIT_PACKAGE_STRIP = "1"
-PACKAGES += "ti-dmai-apps ti-dmai-tests"
-FILES_ti-dmai-apps = "${installdir}/dmai-apps/*"
-FILES_ti-dmai-tests = "${installdir}/dmai-tests/*"
-
-# run time dependencies 
-RDEPENDS_ti-dmai-apps_dm355 += "ti-dm355mm-module ti-cmem-module ti-codecs-dm355"
-RDEPENDS_ti-dmai-apps_dm365 += "ti-dm365mm-module ti-cmem-module ti-codecs-dm365"
-RDEPENDS_ti-dmai-apps_dm6446 += "ti-cmem-module ti-dsplink-module ti-codecs-dm6446"
-RDEPENDS_ti-dmai-apps_dm6467 += "ti-cmem-module ti-dsplink-module ti-codecs-dm6467"
-RDEPENDS_ti-dmai-apps_omap3 += "ti-cmem-module ti-dsplink-module ti-codecs-omap3530 ti-lpm-module ti-sdma-module"
-RDEPENDS_ti-dmai-apps_omapl137 += "ti-cmem-module ti-dsplink-module ti-codecs-omapl137"
-RDEPENDS_ti-dmai-apps_omapl138 += "ti-cmem-module ti-dsplink-module ti-codecs-omapl138"
+# TODO :: Thes could be inherited from ti-dmai-apps
+RDEPENDS_ti-dmai-tests_dm6446   += "ti-codecs-dm6446-server   ti-cmem-module ti-dsplink-module"
+RDEPENDS_ti-dmai-tests_dm6467   += "ti-codecs-dm6467          ti-cmem-module ti-dsplink-module"
+RDEPENDS_ti-dmai-tests_omap3    += "ti-codecs-omap3530-server ti-cmem-module ti-dsplink-module ti-lpm-module ti-sdma-module"
+RDEPENDS_ti-dmai-tests_dm355    += "ti-codecs-dm355           ti-cmem-module ti-dm355mm-module"
+RDEPENDS_ti-dmai-tests_dm365    += "ti-codecs-dm365           ti-cmem-module ti-dm365mm-module"
+RDEPENDS_ti-dmai-tests_omapl137 += "ti-codecs-omapl137-server ti-cmem-module ti-dsplink-module"
+RDEPENDS_ti-dmai-tests_omapl138 += "ti-codecs-omapl138-server ti-cmem-module ti-dsplink-module"
+
+pkg_postinst_ti-dmai-tests () {
+	ln -sf ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ${installdir}/ti-dmai-tests/
+}
+
 
diff --git a/recipes/ti/ti-dsplink.inc b/recipes/ti/ti-dsplink.inc
index 432cfb436e..9fc1375f5e 100644
--- a/recipes/ti/ti-dsplink.inc
+++ b/recipes/ti/ti-dsplink.inc
@@ -15,13 +15,14 @@ PROVIDES += "ti-dsplink-examples"
 
 # This package builds a kernel module, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
-PR_append = "c"
+PR_append = "d"
 
 S = "${WORKDIR}/dsplink_linux_${PV}"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/DSPLink/${PV}/exports/dsplink_linux_${PV}.tar.gz;name=dsplinktarball \
-           file://loadmodules-ti-dsplink-apps.sh \
-           file://unloadmodules-ti-dsplink-apps.sh "
+           file://ti-dsplink-examples-run.sh \
+           file://ti-dsplink-examples-loadmodules.sh \
+           file://ti-dsplink-examples-unloadmodules.sh "
 
 DEPENDS = "ti-dspbios ti-xdctools ti-cgt6x" 
 DEPENDS += "virtual/kernel perl-native" 
@@ -44,7 +45,7 @@ DSPLINKDSPCFG            ?= "<UNDEFINED_DSPLINKDSPCFG>"
 
 DSPLINKGPPOS_dm6446       = "MVL5G"
 DSPLINKGPPOS_dm6467       = "DM6467LSP"
-DSPLINKGPPOS_omapl137     = "ARM"
+DSPLINKGPPOS_omapl137     = "MVL5G"
 DSPLINKGPPOS_omapl138     = "ARM"
 DSPLINKGPPOS_omap3        = "OMAPLSP"
 DSPLINKGPPOS             ?= "<DEFINED_DSPLINKGPPOS>" 
@@ -59,6 +60,9 @@ do_configure() {
     # We can safely sed it out since it has been empty for the past 2 years
     sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c || true 
 
+    # Makefile passes hardcoded CROSS_COMPILE - rename so this doesnt get passed to kbuild
+    sed -i -e s:CROSS_COMPILE:BOGUS_CROSS_COMPILE:g ${S}/dsplink/gpp/src/Rules.mk
+
     # Run perl script to create appropriate makefiles (v1.60 and up)
     (
     cd ${DSPLINK}
@@ -66,7 +70,6 @@ do_configure() {
 	--dspcfg_0=${DSPLINKDSPCFG} --dspos_0=DSPBIOS5XX \
 	--gppos=${DSPLINKGPPOS} --comps=ponslrmc
     )
-
 }
 
 do_prepsources () {
@@ -210,9 +213,10 @@ do_install () {
     done
 
     # Install the example apps module un/load scripts
-    install ${WORKDIR}/loadmodules-ti-dsplink-apps.sh ${D}/${installdir}/ti-dsplink-examples
-    install ${WORKDIR}/unloadmodules-ti-dsplink-apps.sh ${D}/${installdir}/ti-dsplink-examples
-    
+    install ${WORKDIR}/ti-dsplink-examples-loadmodules.sh ${D}/${installdir}/ti-dsplink-examples
+    install ${WORKDIR}/ti-dsplink-examples-unloadmodules.sh ${D}/${installdir}/ti-dsplink-examples
+    install ${WORKDIR}/ti-dsplink-examples-run.sh ${D}/${installdir}/ti-dsplink-examples   
+ 
     # Install/Stage the Source Tree
     install -d ${D}${LINK_INSTALL_DIR_RECIPE}
     cp -pPrf ${S}/* ${D}${LINK_INSTALL_DIR_RECIPE}
@@ -236,7 +240,7 @@ pkg_postrm_ti-dsplink-module_append () {
 }
 
 PACKAGES += "ti-dsplink-examples"
-RDEPENDS_ti-dsplink-examples += "ti-dsplink-module"
-RDEPENDS_ti-dsplink-examples_omap3 += "ti-lpm-module"
+RDEPENDS_ti-dsplink-examples_append = " ti-dsplink-module"
+RDEPENDS_ti-dsplink-examples_append_omap3 += " ti-lpm-module"
 FILES_ti-dsplink-examples = "${installdir}/ti-dsplink-examples/*"
 INSANE_SKIP_ti-dsplink-examples = True
diff --git a/recipes/ti/files/Makefile-dsplink-dsp b/recipes/ti/ti-dsplink/Makefile-dsplink-dsp
index 0861f1ee21..0861f1ee21 100644
--- a/recipes/ti/files/Makefile-dsplink-dsp
+++ b/recipes/ti/ti-dsplink/Makefile-dsplink-dsp
diff --git a/recipes/ti/files/Makefile-dsplink-gpp b/recipes/ti/ti-dsplink/Makefile-dsplink-gpp
index d9f2f6209a..d9f2f6209a 100644
--- a/recipes/ti/files/Makefile-dsplink-gpp
+++ b/recipes/ti/ti-dsplink/Makefile-dsplink-gpp
diff --git a/recipes/ti/files/dsplink-128M.patch b/recipes/ti/ti-dsplink/dsplink-128M.patch
index ff5902bf50..ff5902bf50 100644
--- a/recipes/ti/files/dsplink-128M.patch
+++ b/recipes/ti/ti-dsplink/dsplink-128M.patch
diff --git a/recipes/ti/files/dsplink-add-class-device-create-support.patch b/recipes/ti/ti-dsplink/dsplink-add-class-device-create-support.patch
index b43c3481e1..b43c3481e1 100644
--- a/recipes/ti/files/dsplink-add-class-device-create-support.patch
+++ b/recipes/ti/ti-dsplink/dsplink-add-class-device-create-support.patch
diff --git a/recipes/ti/files/dsplink-semaphore-27.patch b/recipes/ti/ti-dsplink/dsplink-semaphore-27.patch
index b2f71169fd..b2f71169fd 100644
--- a/recipes/ti/files/dsplink-semaphore-27.patch
+++ b/recipes/ti/ti-dsplink/dsplink-semaphore-27.patch
diff --git a/recipes/ti/files/dsplink_1_64_kernel_2_6_33_autoconf.patch b/recipes/ti/ti-dsplink/dsplink_1_64_kernel_2_6_33_autoconf.patch
index 271b3043b5..271b3043b5 100644
--- a/recipes/ti/files/dsplink_1_64_kernel_2_6_33_autoconf.patch
+++ b/recipes/ti/ti-dsplink/dsplink_1_64_kernel_2_6_33_autoconf.patch
diff --git a/recipes/ti/files/loadmodules-ti-dsplink-apps.sh b/recipes/ti/ti-dsplink/ti-dsplink-examples-loadmodules.sh
index 9cfb19d5c1..9cfb19d5c1 100644..100755
--- a/recipes/ti/files/loadmodules-ti-dsplink-apps.sh
+++ b/recipes/ti/ti-dsplink/ti-dsplink-examples-loadmodules.sh
diff --git a/recipes/ti/ti-dsplink/ti-dsplink-examples-run.sh b/recipes/ti/ti-dsplink/ti-dsplink-examples-run.sh
new file mode 100755
index 0000000000..b2f2faac9e
--- /dev/null
+++ b/recipes/ti/ti-dsplink/ti-dsplink-examples-run.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+echo "Running Loop Sample App"
+./loopgpp loop.out 1024 2000 0
+
+echo "Running Message Sample App"
+./messagegpp message.out 10000 0
+
+echo "Running Message Multi Sample App"
+./messagemultigpp messagemulti.out 128 1 0
+
+echo "Running MultiProcessor List Sample App"
+./mplistgpp mplist.out 128 128 0
+
+echo "Running MultiProcessorCriticalSection Transfer Sample App" 
+./mpcsxfergpp mpcsxfer.out 128 1000 0
+
+echo "Running Ringio Sample App"
+./ringiogpp ringio.out 2048 128 0
+
+echo "Running Scale Sample App"
+./scalegpp scale.out 128 500 0
+
+#echo "Running Read/Write Sample App"
+#./readwritegpp readwrite.out 
diff --git a/recipes/ti/files/unloadmodules-ti-dsplink-apps.sh b/recipes/ti/ti-dsplink/ti-dsplink-examples-unloadmodules.sh
index 48fa84b03d..48fa84b03d 100644..100755
--- a/recipes/ti/files/unloadmodules-ti-dsplink-apps.sh
+++ b/recipes/ti/ti-dsplink/ti-dsplink-examples-unloadmodules.sh
diff --git a/recipes/ti/ti-local-power-manager.inc b/recipes/ti/ti-local-power-manager.inc
index 53984d9811..b4c493deb9 100644
--- a/recipes/ti/ti-local-power-manager.inc
+++ b/recipes/ti/ti-local-power-manager.inc
@@ -25,7 +25,10 @@ DEPENDS += "virtual/kernel"
 
 LPMDSPPOWERSOC_omap3  = "omap3530"
 LPMDSPPOWERSOC_dm6446 = "dm6446"
-LPMDSPPOWERSOC        ?= "<UNDEFINED_LPMDSPPOWERSOC>"
+LPMDSPPOWERSOC       ?= "<UNDEFINED_LPMDSPPOWERSOC>"
+
+XDC_PLATFORM_omap3    = "ti.platforms.evm3530"
+XDC_PLATFORM         ?= "<UNDEFINED_XDC_PLATFORM>"
 
 do_configure () {
 
diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc
index badde385fc..64d236535e 100644
--- a/recipes/ti/ti-multimedia-common.inc
+++ b/recipes/ti/ti-multimedia-common.inc
@@ -1,18 +1,21 @@
 installdir = "${datadir}/ti"
 
 # needed for configuro:
-export CGTOOLS_V5T="${TOOLCHAIN_PATH}"
-export CC_V5T="bin/${TARGET_PREFIX}gcc"
-export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
-export MVTOOL_PREFIX="${TARGET_PREFIX}"
-export MVTOOL_DIR="${TOOLCHAIN_PATH}"
-export CSTOOL_PREFIX="${TARGET_PREFIX}"
-export CSTOOL_DIR="${TOOLCHAIN_PATH}"
-export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
+#export CGTOOLS_V5T="${TOOLCHAIN_PATH}"
 
+# hmmmm
+#export CC_V5T="bin/${TARGET_PREFIX}gcc"
 
-export LINUXLIBS_INSTALL_DIR  = "${STAGING_DIR_HOST}/usr"
-export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
+#export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
+
+#export MVTOOL_PREFIX="${TARGET_PREFIX}"
+#export MVTOOL_DIR="${TOOLCHAIN_PATH}"
+#export CSTOOL_PREFIX="${TARGET_PREFIX}"
+#export CSTOOL_DIR="${TOOLCHAIN_PATH}"
+
+#export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
+#export LINUXLIBS_INSTALL_DIR  = "${STAGING_DIR_HOST}/usr"
+#export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
 
 # This is where do_install will put it
 export CODEGEN_INSTALL_DIR_RECIPE    = "${installdir}/ti-cgt6x-tree"
@@ -48,30 +51,30 @@ export DMAI_INSTALL_DIR       = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DMAI_IN
 export CODEC_INSTALL_DIR      = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEC_INSTALL_DIR_RECIPE}"
 export DSPLIB_INSTALL_DIR     = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DSPLIB_INSTALL_DIR_RECIPE}"
 
-export USER_XDC_PATH    = "${CE_INSTALL_DIR}/examples"
-export XDC_TARGET       = gnu.targets.arm.GCArmv5T
+#export USER_XDC_PATH    = "${CE_INSTALL_DIR}/examples"
 
-XDC_PLATFORM_dm355   = ti.platforms.evmDM355
-XDC_PLATFORM_dm365   = ti.platforms.evmDM365
-XDC_PLATFORM_dm6446  = ti.platforms.evmDM6446
-XDC_PLATFORM_dm6467  = ti.platforms.evmDM6467
-XDC_PLATFORM_omap3   = ti.platforms.evm3530
-XDC_PLATFORM_omapl137 = ti.platforms.evmOMAPL137
-XDC_PLATFORM_omapl138 = ti.platforms.evmOMAPL138
-export XDC_PLATFORM
+#export XDC_TARGET       = gnu.targets.arm.GCArmv5T
+#XDC_PLATFORM_dm355   = ti.platforms.evmDM355
+#XDC_PLATFORM_dm365   = ti.platforms.evmDM365
+#XDC_PLATFORM_dm6446  = ti.platforms.evmDM6446
+#XDC_PLATFORM_dm6467  = ti.platforms.evmDM6467
+#XDC_PLATFORM_omap3   = ti.platforms.evm3530
+#XDC_PLATFORM_omapl137 = ti.platforms.evmOMAPL137
+#XDC_PLATFORM_omapl138 = ti.platforms.evmOMAPL138
+#export XDC_PLATFORM
 
-export PLATFORM_XDC = ${XDC_PLATFORM}
+#export PLATFORM_XDC = ${XDC_PLATFORM}
 
 DSPSUFFIX_omapl137 = "x674"
 DSPSUFFIX_omapl138 = "x674"
 DSPSUFFIX ?= "x64P"
 
-PLATFORM_dm355   = "dm355"
-PLATFORM_dm365   = "dm365"
-PLATFORM_dm6446  = "dm6446"
-PLATFORM_dm6467  = "dm6467"
-PLATFORM_omap3   = "omap3530"
-PLATFORM_omapl137 = "ol137"
-PLATFORM_omapl138 = "ol138"
-export PLATFORM
+#PLATFORM_dm355   = "dm355"
+#PLATFORM_dm365   = "dm365"
+#PLATFORM_dm6446  = "dm6446"
+#PLATFORM_dm6467  = "dm6467"
+#PLATFORM_omap3   = "omap3530"
+#PLATFORM_omapl137 = "ol137"
+#PLATFORM_omapl138 = "ol138"
+#export PLATFORM
 
diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc
index 12faee634d..1daf3264b4 100644
--- a/recipes/ti/ti-paths.inc
+++ b/recipes/ti/ti-paths.inc
@@ -1,13 +1,11 @@
 require ti-multimedia-common.inc
 
-export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
+#export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}"
 
-PLATFORM ?= "dm6446"
-PLATFORM_dm6446 = "dm6446"
-PLATFORM_dm6467 = "dm6467"
-export PLATFORM
+#PLATFORM ?= "dm6446"
+#PLATFORM_dm6446 = "dm6446"
+#PLATFORM_dm6467 = "dm6467"
+#export PLATFORM
 
-export CODEC ?= "${CODEC_INSTALL_DIR}"
-
-installdir = "${datadir}/ti"
+#installdir = "${datadir}/ti"
 
diff --git a/recipes/ti/ti-xdais.inc b/recipes/ti/ti-xdais.inc
index 8441b97084..3a01e0377a 100644
--- a/recipes/ti/ti-xdais.inc
+++ b/recipes/ti/ti-xdais.inc
@@ -9,7 +9,7 @@ PR = "r1"
 
 S = "${WORKDIR}/xdais_${PV}"
 
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports/xdais_${PV}.tar.gz;name=xdaisgz"
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports/xdais_${PV}.tar.gz;name=xdaistarball"
 
 do_install() {
     install -d ${D}${XDAIS_INSTALL_DIR_RECIPE}
diff --git a/recipes/ti/ti-xdais_6.25.01.08.bb b/recipes/ti/ti-xdais_6.25.01.08.bb
index 4bff8eb7c7..f4fd031c91 100644
--- a/recipes/ti/ti-xdais_6.25.01.08.bb
+++ b/recipes/ti/ti-xdais_6.25.01.08.bb
@@ -2,6 +2,6 @@ require ti-xdais.inc
 
 PV = "6_25_01_08"
 
-SRC_URI[xdaisgz.md5sum] = "5f284e0721f4f080c9adc6271387c0f9"
-SRC_URI[xdaisgz.sha256sum] = "88866b1bbd3992141f47f7a672cd4a2fbeef729d582312a06a1f269a32dded88"
+SRC_URI[xdaistarball.md5sum] = "5f284e0721f4f080c9adc6271387c0f9"
+SRC_URI[xdaistarball.sha256sum] = "88866b1bbd3992141f47f7a672cd4a2fbeef729d582312a06a1f269a32dded88"