recipes/ti: merge in updates

* New codec recipes from Arago team in Germantown
* Updated dm6446 and dm355 from Brijesh Singh
* cmem, gst-ti and dmai fixes from Brijesh Singh

angstrom: introduce SOC_FAMILY and start using it TI recipes as a testing ground

* SOC_FAMILY tells you which system on chip is used in the MACHINE, e.g. omap3, dm355, pxa25x, s3c24xx.
  This avoids having to duplicate lots of overrides in machine specific recipes. This is *NOT*
  intended to be used as a package arch.

1 files changed, 26 insertions, 21 deletions

diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb
index a204120fc2..1fa03e22fa 100644
--- a/recipes/ti/ti-dmai_svn.bb
+++ b/recipes/ti/ti-dmai_svn.bb
@@ -7,19 +7,24 @@ inherit module-base
 MACHINE_KERNEL_PR_append = "c"
 
 # compile time dependencies
-DEPENDS_omap3evm  += "alsa-lib ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-cs1-omap3530 virtual/kernel ti-dsplink-module"
-DEPENDS_armv7a	+= "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-cs1-omap3530 virtual/kernel ti-dsplink-module "
-DEPENDS_dm6446-evm 	+= "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-dm6446 virtual/kernel ti-dsplink-module "
-DEPENDS_dm355-evm  	+= "alsa-lib ti-codec-engine ti-xdctools-native ti-codec-combo-dm355 virtual/kernel"
-DEPENDS_da830-omapl137-evm 	+= "alsa-lib  ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-omapl137 virtual/kernel ti-dsplink-module "
+DEPENDS = "alsa-lib ti-framework-components ti-codec-engine ti-xdctools-native"
+
+DEPENDS_append_omap3    = " ti-dspbios-native ti-cgt6x-native ti-codecs-omap3530 virtual/kernel ti-linuxutils"
+DEPENDS_append_dm6446 	= " ti-dspbios-native ti-cgt6x-native ti-codecs-dm6446 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-native ti-cgt6x-native ti-codecs-omapl137 virtual/kernel ti-linuxutils"
+DEPENDS_append_omapl138 = " ti-dspbios-native ti-cgt6x-native ti-codecs-omapl138 virtual/kernel ti-linuxutils"
 
 # Define DMAI build time variables
-TARGET 			?= "all"
-TARGET_armv7a 	?= "o3530_al"
-TARGET_dm6446-evm 	?= "dm6446_al"
-TARGET_da830-omapl137-evm 	?= "ol137_al"
+TARGET_omap3     = "o3530_al"
+TARGET_dm6446    = "dm6446_al"
+TARGET_omapl137 = "ol137_al"
+TARGET_omapl138 = "ol138_al"
+TARGET_dm355     = "dm355_al"
+TARGET_dm365     = "dm365_al"
+TARGET          ?= "all"
 
-DSPBIOS_DIR = "${STAGING_DIR_NATIVE}/ti-dspbios-native"
 CGT6x_DIR = "${STAGING_DIR_NATIVE}/ti-cgt6x-native"
 XDCTOOLS_DIR = "${STAGING_DIR_NATIVE}/ti-xdctools-native"
 USER_XDC_PATH = "${CE_INSTALL_DIR}/examples"
@@ -31,7 +36,7 @@ do_configure () {
 	# PSP kernel is based on older DSS. we need to replace linux/omapfb.h with
 	# mach/omapfb.h 
 
-    if [ ${MACHINE} == "omap3evm" ] ; then
+    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
@@ -42,9 +47,9 @@ do_compile () {
 
 	unset DMAI_INSTALL_DIR
 	cd ${S}
-	make XDC_INSTALL_DIR="${XDCTOOLS_DIR}" clean
+	make XDC_INSTALL_DIR="${XDCTOOLS_DIR}" PLATFORM="${TARGET}" clean
 
-	#  TODO: Figure out how to pass the alsa include location, currently 
+	#  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}" \
@@ -52,14 +57,14 @@ do_compile () {
 		LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \
 		XDC_INSTALL_DIR="${XDCTOOLS_DIR}" \
 		CODEGEN_INSTALL_DIR="${CGT6x_DIR}" \
-		BIOS_INSTALL_DIR="${DSPBIOS_DIR}"\
+		BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\
 		LINUXLIBS_INSTALL_DIR="${STAGING_DIR_HOST}/usr" \
 		USER_XDC_PATH="${USER_XDC_PATH}" \
 		CROSS_COMPILE="${CROSS_DIR}/bin/${TARGET_PREFIX}" \
 		VERBOSE="true" \
-		XDAIS_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+		XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \
 		LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \
-		CMEM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \
+		CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \
 		LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \	
 		PLATFORM="${TARGET}"
 }
@@ -97,9 +102,9 @@ FILES_ti-dmai-apps = "${installdir}/dmai-apps/*"
 FILES_ti-dmai-tests = "${installdir}/dmai-tests/*"
 
 # run time dependencies 
-RDEPENDS_ti-dmai-apps_dm355-evm += "ti-dm355mm-module ti-cmem-module ti-codec-combo-dm355"
-RDEPENDS_ti-dmai-apps_dm6446-evm += "ti-cmem-module ti-dsplink-module ti-codec-combo-dm6446"
-RDEPENDS_ti-dmai-apps_omap3evm += "ti-cmem-module ti-dsplink-module ti-cs1-omap3530 ti-lpm-module ti-sdma-module"
-RDEPENDS_ti-dmai-apps_armv7a += "ti-cmem-module ti-dsplink-module ti-cs1-omap3530 ti-lpm-module ti-sdma-module"
-RDEPENDS_ti-dmai-apps_da830-omapl137-evm += "ti-cmem-module ti-dsplink-module ti-codec-combo-ol137"
+RDEPENDS_ti-dmai-apps_dm355 += "ti-dm355mm-module ti-cmem-module ti-codecs-dm355"
+RDEPENDS_ti-dmai-apps_dm6446 += "ti-cmem-module ti-dsplink-module ti-codecs-dm6446"
+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"