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
-		in