ti-dmai_svn: move the common build code in ti-dmai.inc

Signed-off-by: Brijesh Singh <bksingh@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

diff --git a/recipes/ti/ti-dmai.inc b/recipes/ti/ti-dmai.inc
new file mode 100644 (file)
index 0000000..2e04076
--- /dev/null
+++ b/recipes/ti/ti-dmai.inc
@@ -0,0 +1,146 @@
+DESCRIPTION = "Davinci Multimedia Application Interface (DMAI) for TI ARM/DSP processors"
+HOMEPAGE = "https://gforge.ti.com/gf/project/dmai/"
+SECTION = "multimedia"
+LICENSE = "BSD"
+
+# TODO :: 
+
+require ti-paths.inc
+require ti-staging.inc
+
+PROVIDES += "ti-dmai-apps ti-dmai-tests"
+
+PE = "1"
+
+SRCREV               ?= "<UNDEFINED_SRCREV>"
+DMAIBRANCH           ?= "<UNDEFINED_DMAIBRANCH>"
+
+S = "${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface"
+
+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 \
+       "
+
+SRC_URI_append_omapl137 = " file://dmai-r423-add-omapl137-support.patch "
+
+DEPENDS = "virtual/kernel alsa-lib ti-framework-components ti-codec-engine ti-xdctools"
+
+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
+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           ?= "<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_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 () {
+
+    # 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 -d ${D}/${installdir}/ti-dmai-apps
+    cd ${S}/dmai
+    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}/ti-dmai-tests
+    cd ${S}/tests
+    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 ti-edma-module ti-irq-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 () {
+       if [ -f ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ]; then
+       ln -sf ${installdir}/ti-codecs-server/*.${DSPSUFFIX} ${installdir}/ti-dmai-apps/
+       fi
+}
+
+PACKAGES += "ti-dmai-tests"
+FILES_ti-dmai-tests = "${installdir}/ti-dmai-tests/*"
+INSANE_SKIP_ti-dmai-tests = True
+
+# To make dependency more simpler we just depend on ti-dmai-apps
+RDEPENDS_ti-dmai-tests   += "ti-dmai-apps"
+

diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb
index 91c1b4b..5a9aeba 100644 (file)
--- a/recipes/ti/ti-dmai_svn.bb
+++ b/recipes/ti/ti-dmai_svn.bb
@@ -1,23 +1,12 @@
-DESCRIPTION = "Davinci Multimedia Application Interface (DMAI) for TI ARM/DSP processors"
-HOMEPAGE = "https://gforge.ti.com/gf/project/dmai/"
-SECTION = "multimedia"
-LICENSE = "BSD"
+require ti-dmai.inc
 
-# TODO :: 
+DEFAULT_PREFERENCE = "-1"
 
-require ti-paths.inc
-require ti-staging.inc
-
-PROVIDES += "ti-dmai-apps ti-dmai-tests"
-
-PE = "1"
 PV = "1.0+svnr${SRCPV}"
 
 # This package has high dependence on kernel, use kernel PR as base and append a local version
 PR = "${MACHINE_KERNEL_PR}"
-PR_append = "j"
-
-S = "${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface"
+PR_append = "l"
 
 DMAIBRANCH_dm6446     = "trunk"
 DMAIBRANCH_dm6467     = "branches/GITPSP_INT_101009"
@@ -36,154 +25,3 @@ SRCREV_dm365          = "441"
 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 \
-       "
-
-SRC_URI_append_omapl137 = " file://dmai-r423-add-omapl137-support.patch "
-
-DEPENDS = "virtual/kernel alsa-lib ti-framework-components ti-codec-engine ti-xdctools"
-
-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
-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           ?= "<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
-
-    # 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 () {
-
-    # 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 -d ${D}/${installdir}/ti-dmai-apps
-    cd ${S}/dmai
-    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}/ti-dmai-tests
-    cd ${S}/tests
-    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 ti-edma-module ti-irq-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}/ti-codecs-server/*.${DSPSUFFIX} ${installdir}/ti-dmai-apps/
-}
-
-PACKAGES += "ti-dmai-tests"
-FILES_ti-dmai-tests = "${installdir}/ti-dmai-tests/*"
-INSANE_SKIP_ti-dmai-tests = True
-
-# 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 ti-edma-module ti-irq-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/
-}
-
-