diff options
author | Roger Monk <r-monk@ti.com> | 2010-09-30 10:55:42 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2010-09-30 13:20:27 +0200 |
commit | 89a853efcd610ddf02abf9ce76694c80acaca455 (patch) | |
tree | ac6c77f9527c81e165333cd0d4719361a1ae08a6 /recipes/ti | |
parent | 915f3afd5c6567ec5fa3fed80e6b10a092fbe354 (diff) | |
download | openembedded-89a853efcd610ddf02abf9ce76694c80acaca455.tar.gz |
ti-dmai: sync with arago
Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'recipes/ti')
-rw-r--r-- | recipes/ti/ti-dmai.inc | 52 | ||||
-rw-r--r-- | recipes/ti/ti-dmai/touchbook-support.patch | 11 | ||||
-rw-r--r-- | recipes/ti/ti-dmai_2.05.00.14.bb | 18 | ||||
-rw-r--r-- | recipes/ti/ti-dmai_2.10.00.09.bb | 16 | ||||
-rw-r--r-- | recipes/ti/ti-dmai_2.10.00.10.bb | 17 | ||||
-rw-r--r-- | recipes/ti/ti-dmai_2.20.00.04.bb | 9 | ||||
-rw-r--r-- | recipes/ti/ti-dmai_2.20.00.06.bb | 16 |
7 files changed, 41 insertions, 98 deletions
diff --git a/recipes/ti/ti-dmai.inc b/recipes/ti/ti-dmai.inc index 2e04076478..d9af56c3f9 100644 --- a/recipes/ti/ti-dmai.inc +++ b/recipes/ti/ti-dmai.inc @@ -8,14 +8,14 @@ LICENSE = "BSD" require ti-paths.inc require ti-staging.inc -PROVIDES += "ti-dmai-apps ti-dmai-tests" +PROVIDES += "ti-dmai-apps" PE = "1" SRCREV ?= "<UNDEFINED_SRCREV>" DMAIBRANCH ?= "<UNDEFINED_DMAIBRANCH>" -S = "${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface" +S = "${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface/dmai_${PV}" SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${DMAIBRANCH};proto=https;user=anonymous;pswd='' \ file://loadmodules-ti-dmai-dm6446_al.sh \ @@ -25,10 +25,10 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${DMAIBRANCH};proto=https;user=a file://loadmodules-ti-dmai-dm365_al.sh \ file://loadmodules-ti-dmai-ol137_al.sh \ file://loadmodules-ti-dmai-ol138_al.sh \ + file://doxygen_templates.tar.gz \ + file://arago-tdox \ " -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" @@ -54,6 +54,11 @@ DMAIPLATFORM ?= "<UNDEFINED_DMAIPLATFORM>" #GPPOS_dm365 = "LINUX_GCC" #GPPOS ?= "<UNDEFINEDGPPOS>" +# Need to re-define this for OMAP-L137/L138 +DSPSUFFIX_omapl137 = "x64P" +DSPSUFFIX_omapl138 = "x64P" +DSPSUFFIX ?= "x64p" + # 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" @@ -61,21 +66,28 @@ 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 + # run the release steps - this will delete .svn file and run doxygen to + # generate proper documentation of the source etc. + find ${WORKDIR}/${DMAIBRANCH} -name .svn -type d | xargs rm -rf + cp -pPrf ${WORKDIR}/doxygen_templates ${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface + cp -pPrf ${WORKDIR}/arago-tdox ${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface/tdox + chmod a+x ${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface/release.sh + chmod a+x ${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface/tdox + sed -i 's|tdox|./tdox|g' ${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface/release.sh + (cd ${WORKDIR}/${DMAIBRANCH}/davinci_multimedia_application_interface; ./release.sh ${PV}) } -addtask prepsources after do_configure before do_compile +# run prepare sources before do_patch to ensure that sourceipk picks the right sources. +addtask prepsources after do_unpack before do_patch do_compile () { - # TODO :: Why do we do this? unset DMAI_INSTALL_DIR cd ${S} - for dir in ${S}/dmai ${S}/tests ; do + make XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" PLATFORM="${DMAIPLATFORM}" clean + + for dir in ${S}; do cd $dir # TODO: Figure out how to pass the alsa require location, currently # LINUXLIBS_INSTALL_DIR is hard-coded for armv5te @@ -106,17 +118,12 @@ do_install () { unset DMAI_INSTALL_DIR install -d ${D}/${installdir}/ti-dmai-apps - cd ${S}/dmai + cd ${S} 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} + cp -pPrf ${S}/* ${D}${DMAI_INSTALL_DIR_RECIPE} } PACKAGES += "ti-dmai-apps" @@ -132,15 +139,6 @@ RDEPENDS_ti-dmai-apps_omapl137 += "ti-codecs-omapl137-server ti-cmem-module ti- 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/touchbook-support.patch b/recipes/ti/ti-dmai/touchbook-support.patch deleted file mode 100644 index da64c5b0d1..0000000000 --- a/recipes/ti/ti-dmai/touchbook-support.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Cpu.c 2009-09-25 12:41:08.000000000 +0200 -+++ davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/Cpu.c 2009-09-25 12:41:36.000000000 +0200 -@@ -107,6 +107,8 @@ - } - else if ((strcmp(valBuf,"OMAP3EVM Board") == 0) || - (strcmp(valBuf, "OMAP3 EVM") == 0) || -+ (strcmp(valBuf, "OMAP3 Touch Book") == 0) || -+ (strcmp(valBuf, "IGEP v2.x board") == 0) || - (strcmp(valBuf, "OMAP3 Beagle Board") == 0)) { - *device = Cpu_Device_OMAP3530; - } diff --git a/recipes/ti/ti-dmai_2.05.00.14.bb b/recipes/ti/ti-dmai_2.05.00.14.bb index 586ad477f8..c3981d0d81 100644 --- a/recipes/ti/ti-dmai_2.05.00.14.bb +++ b/recipes/ti/ti-dmai_2.05.00.14.bb @@ -1,24 +1,10 @@ require ti-dmai.inc PV = "2_05_00_14" -PR = "r0" +PR = "r4" -COMPATIBLE_MACHINE = "(omap3evm|dm37x-evm|am37x-evm)" - -SRC_URI_append = " \ - file://doxygen_templates.tar.gz \ - file://arago-tdox \ -" +COMPATIBLE_MACHINE = "(omap3evm|dm37x-evm)" SRCREV = "488" DMAIBRANCH = "tags/TAG_2_05_00_14" -do_install_prepend () { - find ${S} -name .svn -type d | xargs rm -rf - cp -pPrf ${WORKDIR}/doxygen_templates ${S} - cp -pPrf ${WORKDIR}/arago-tdox ${S}/tdox - chmod a+x ${S}/release.sh - chmod a+x ${S}/tdox - ${S}/release.sh ${PV} -} - diff --git a/recipes/ti/ti-dmai_2.10.00.09.bb b/recipes/ti/ti-dmai_2.10.00.09.bb index a531a55bf9..ad6069bac5 100644 --- a/recipes/ti/ti-dmai_2.10.00.09.bb +++ b/recipes/ti/ti-dmai_2.10.00.09.bb @@ -1,21 +1,9 @@ require ti-dmai.inc PV = "2_10_00_09" -PR = "r3" +PR = "r6" -COMPATIBLE_MACHINE = "(dm365-evm|dm355-evm|dm6467-evm)" - -SRC_URI_append = "file://doxygen_templates.tar.gz \ - file://arago-tdox" - +COMPATIBLE_MACHINE = "(dm365-evm|dm355-evm|dm6467-evm|dm6467t-evm)" SRCREV = "443" DMAIBRANCH = "branches/GITPSP_INT_101009" -do_install_prepend () { - find ${S} -name .svn -type d | xargs rm -rf - cp -pPrf ${WORKDIR}/doxygen_templates ${S} - cp -pPrf ${WORKDIR}/arago-tdox ${S}/tdox - chmod a+x ${S}/release.sh - chmod a+x ${S}/tdox - ${S}/release.sh ${PV} -} diff --git a/recipes/ti/ti-dmai_2.10.00.10.bb b/recipes/ti/ti-dmai_2.10.00.10.bb index 6bbc497f09..5aa0eb3ae6 100644 --- a/recipes/ti/ti-dmai_2.10.00.10.bb +++ b/recipes/ti/ti-dmai_2.10.00.10.bb @@ -1,22 +1,9 @@ require ti-dmai.inc PV = "2_10_00_10" -PR = "r2" +PR = "r5" -COMPATIBLE_MACHINE = "(dm365-evm|dm355-evm|dm6467-evm)" - -SRC_URI_append = "file://0001-Correct-DMAI-s-Resize-module-for-DM365.patch \ - file://doxygen_templates.tar.gz \ - file://arago-tdox" - +COMPATIBLE_MACHINE = "(dm365-evm|dm355-evm|dm6467-evm|dm6467t-evm)" SRCREV = "452" DMAIBRANCH = "branches/GITPSP_INT_101009" -do_install_prepend () { - find ${S} -name .svn -type d | xargs rm -rf - cp -pPrf ${WORKDIR}/doxygen_templates ${S} - cp -pPrf ${WORKDIR}/arago-tdox ${S}/tdox - chmod a+x ${S}/release.sh - chmod a+x ${S}/tdox - ${S}/release.sh ${PV} -} diff --git a/recipes/ti/ti-dmai_2.20.00.04.bb b/recipes/ti/ti-dmai_2.20.00.04.bb new file mode 100644 index 0000000000..5887ff116d --- /dev/null +++ b/recipes/ti/ti-dmai_2.20.00.04.bb @@ -0,0 +1,9 @@ +require ti-dmai.inc + +PV = "2_20_00_04" +PR = "r3" + +COMPATIBLE_MACHINE = "(da850-omapl138-evm|da830-omapl137-evm)" +SRCREV = "500" +DMAIBRANCH = "tags/TAG_2_20_00_04" + diff --git a/recipes/ti/ti-dmai_2.20.00.06.bb b/recipes/ti/ti-dmai_2.20.00.06.bb index 21f10fc108..e564a44a7f 100644 --- a/recipes/ti/ti-dmai_2.20.00.06.bb +++ b/recipes/ti/ti-dmai_2.20.00.06.bb @@ -1,24 +1,10 @@ require ti-dmai.inc PV = "2_20_00_06" -PR = "r2" +PR = "r3" COMPATIBLE_MACHINE = "dm365-evm" -SRC_URI_append = " \ - file://doxygen_templates.tar.gz \ - file://arago-tdox \ -" - SRCREV = "519" DMAIBRANCH = "tags/TAG_2_20_00_06" -do_install_prepend () { - find ${S} -name .svn -type d | xargs rm -rf - cp -pPrf ${WORKDIR}/doxygen_templates ${S} - cp -pPrf ${WORKDIR}/arago-tdox ${S}/tdox - chmod a+x ${S}/release.sh - chmod a+x ${S}/tdox - ${S}/release.sh ${PV} -} - |