ti recipes: Start moving /files into package specific directories

ti-codec-engine: Cleanup Codec Engine Recipe

   * Fix Installer Issues
   * Cleanup Variable Names + Add for all targets
   * Remove non-tspa older 2.24.01 recipe
   * Add omapl137 depends

ti-xdais: Recipe Cleanup

ti-dsplink: Add runscript to run all example applications (for easy testing)

   * Add run script
   * Rename load/unload scripts for consistency
   * Use _append instead of += for RDEPENDS
   * ti-dsplink: fix GPPOS for omapl137
   * SED out CROSS_COMPILE from dsplink Makefile

gstreamer-ti: Recipe Cleanup align with other recipes

   * Recipe cleanup, cosmetics
   * Move required variables inside recipe
   * Ensure all targets have variables assigned
   * Add -rc scripts for all targets
   * Add runtime recommends for all targets
   * Needs LINUXKERNEL_INSTALL_DIR setting
   * export LINUXKERNEL_INSTALL_DIR for gstreamer_ti
   * add logic for patching to newer kernel (mach/omapfb)
   * don't error out if the sed on omapfb fails since the header won't be there for non-omap3
ti-codecs: Recipe cleanup for omapl, omap3 and dm6446

   * Cleanup of omap3, omapl138, omapl137, dm6446
   * Start building omapl138 recipe
   * Add prepsources step
   * Package codecs into -server package
   * Add qualiTI reports and codec data sheet
   * Variable cleanup
   * Set stage for common codec build recipe
   * Temp comment out variables, for removal in subsequent commit after validation

ti-dmai: Recipe cleanup

   * Recipe cleanup, cosmetics
   * Move required variables inside recipe, remove unused variables
   * Runtime deps for -apps, -tests
   * Add loadmodules script for omapl137
   * Need to pass path to CE 'example' codecs for arm side audio codec (g711)

ti-local-power-manager: Set XDC_PLATFORM

   * lpm needs XDC platform defined.

Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

1 files changed, 130 insertions, 98 deletions

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/
+}
+