diff options
| -rw-r--r-- | packages/dsplink/ti-codec-combos_3.16.bb (renamed from packages/dsplink/omap3530-dvsdk-combos_3.16.bb) | 29 | ||||
| -rw-r--r-- | packages/dsplink/ti-codec-engine_2.21.bb | 16 | ||||
| -rw-r--r-- | packages/dsplink/ti-dmai_1.20.bb (renamed from packages/dsplink/dmai_1.20.bb) | 39 | ||||
| -rw-r--r-- | packages/dsplink/ti-dsplink_1.60.bb | 25 |
4 files changed, 62 insertions, 47 deletions
diff --git a/packages/dsplink/omap3530-dvsdk-combos_3.16.bb b/packages/dsplink/ti-codec-combos_3.16.bb index 278d743c28..60a976f1c9 100644 --- a/packages/dsplink/omap3530-dvsdk-combos_3.16.bb +++ b/packages/dsplink/ti-codec-combos_3.16.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Codec combos for omap3530" -DEPENDS = "codec-engine" +DEPENDS = "ti-codec-engine" LICENCE = "unknown" require ti-paths.inc @@ -13,12 +13,11 @@ SRC_URI = "file://omap3530_dvsdk_combos_3_16.tar.gz \ S = "${WORKDIR}/omap3530_dvsdk_combos_3_16" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "316" - -PACKAGE_ARCH = "${MACHINE_ARCH}" +PR = "r10" TARGET = "all" -export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools" +export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/packages;${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" do_compile() { sed -i -e s:/db/toolsrc/library/vendors2005/ti/c6x/6.0.16/Linux:${TITOOLSDIR}/${TICGTOOLSDIR}:g \ @@ -32,9 +31,27 @@ do_compile() { do_install () { echo oe_runmake install + + install -d ${D}/${datadir}/ti-codec-combos + + cd ${S} + + # grab the server executables + for i in $(find . -name "*.x64P") ; do + install ${i} ${D}/${datadir}/ti-codec-combos + done + + # should copy the generated data sheets as well for reference } do_stage () { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecs - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecs + install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combos + cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combos } + +FILES_ti-codec-combos = "${datadir}/ti-codec-combos/*" + +INHIBIT_PACKAGE_STRIP = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb index 1c82e53971..2eaa40c0e9 100644 --- a/packages/dsplink/ti-codec-engine_2.21.bb +++ b/packages/dsplink/ti-codec-engine_2.21.bb @@ -8,7 +8,7 @@ RDEPENDS = "update-modules" inherit module # tconf from xdctools dislikes '.' in pwd :/ -PR = "r9" +PR = "r10" PV = "221" # Get CE tarball from TI website, place in sources and calculate @@ -97,6 +97,7 @@ do_compile_append() { # For now, remove all targets, except dm6446 and omap3530 sed -i \ -e '/evmDM357/d' \ + -e '/evmDM6446/d' \ -e '/evmDM6467/d' \ -e '/evmDM355/d' \ -e '/evmDM6437/d' \ @@ -130,8 +131,6 @@ do_install_append () { #driver - kernel module install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true - # - Not sure what this is... maybe stale - #cp ${S}/cetools/packages/ti/bios/power/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true cp ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true #library @@ -175,13 +174,13 @@ do_install_append () { install ${i} ${D}/${datadir}/ti-codec-engine/`dirname ${i}` done + # we should install the CMEM apps as well here + # finally, strip targets that we're not supporting here # - TODO... } -#FILES_${PN} = "${base_sbindir}" - -PACKAGES =+ "ti-lpm-module ti-cmem-module" +PACKAGES =+ "ti-lpm-module ti-cmem-module ti-codec-engine-apps" FILES_ti-lpm-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko" FILES_ti-cmem-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/cmemk.ko" @@ -199,7 +198,7 @@ pkg_postrm_ti-lpm-module () { update-modules || true } -pkg_postinst_ti-cmemk-module () { +pkg_postinst_ti-cmem-module () { if [ -n "$D" ]; then exit 1 fi @@ -218,6 +217,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #legacy upgrade helpers RPROVIDES_ti-cmem-module += "ti-cmemk-module" +# ti-dsplink-module can be built by either codec-engine or standalone dsplink - tell it to use this one, else unwanted dependence +PREFERRED_PROVIDER_ti-dsplink-module = "ti-codec-engine" + #add run-time dependencies - note for kernel module we can only use RRECOMMENDS, since modules might be built into the kernel RRECOMMENDS_ti-codec-engine-apps += "ti-dsplink-module ti-lpm-module ti-cmem-module" diff --git a/packages/dsplink/dmai_1.20.bb b/packages/dsplink/ti-dmai_1.20.bb index 656030995d..d25daf6622 100644 --- a/packages/dsplink/dmai_1.20.bb +++ b/packages/dsplink/ti-dmai_1.20.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Davinci (and OMAP) Multimedia Application Interface" -DEPENDS = "virtual/kernel codec-engine omap3530-dvsdk-combos" +DEPENDS = "virtual/kernel ti-codec-engine ti-codec-combos" LICENCE = "unknown" require ti-paths.inc @@ -18,20 +18,20 @@ SRC_URI = "file://dmai_1_20_00_06.tar.gz \ S = "${WORKDIR}/dmai_1_20_00_06" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "120" - -PACKAGE_ARCH = "${MACHINE_ARCH}" +PR = "r10" TARGET = "all" TARGET_neuros-osd2 = " dm6446_al dm6446_db" TARGET_beagleboard = " o3530_al" TARGET_omap3evm = " o3530_al" -export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools" -export CODEC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecs" +export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine" +export FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" +export CODEC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combos" do_compile_prepend_omap3evm() { -#temp removal of sources that fail to build +#temp removal of sources that fail to build on evm3530 if [ -e packages/ti/sdo/dmai/linux/omap3530/Resize.c ]; then rm packages/ti/sdo/dmai/linux/omap3530/Resize.c fi @@ -51,10 +51,31 @@ do_compile() { } do_install () { - echo oe_runmake install + install -d ${D}/${datadir}/ti-dmai/apps + + export EXEC_DIR="${D}/${datadir}/ti-dmai/apps" + oe_runmake install } do_stage () { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dmai - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dmai + install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai + cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai +} + +PACKAGES =+ "ti-dmai-apps" + +FILES_ti-dmai-apps = "${datadir}/ti-dmai/*" + +pkg_postinst_ti-dmai-apps () { + ln -s /usr/local/share/ti-codec-combos/* /usr/local/share/ti-dmai/apps } + +INHIBIT_PACKAGE_STRIP = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +#add run-time dependencies - note for kernel module we can only use RRECOMMENDS, since modules might be built into the kernel +# and for now we make codecs RRECOMMENDS as well, since not everyone will have them +#RDEPENDS_ti-dmai-apps += "ti-codec-combos" +RRECOMMENDS_ti-dmai-apps += "ti-cmem-module ti-lpm-module ti-dsplink-module ti-codec-combos" + diff --git a/packages/dsplink/ti-dsplink_1.60.bb b/packages/dsplink/ti-dsplink_1.60.bb deleted file mode 100644 index 64fbba7162..0000000000 --- a/packages/dsplink/ti-dsplink_1.60.bb +++ /dev/null @@ -1,25 +0,0 @@ -require dsplink.inc - -# The tconf tool breaks if there is a '.' in your pwd -PR = "r9" -PE = "1" -PV = "160" - -# Get dsplink tarball from TI website, place in sources and calculate -# md5sum -# Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/link/link_1_60/index.html - -SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_60.tar.gz \ - file://dsplink-semaphore-27.patch;patch=1;pnum=4 \ - file://Makefile-dsplink-gpp \ - file://Makefile-dsplink-dsp \ -" - -S = "${WORKDIR}/dsplink_1_60/dsplink" - -require ti-paths.inc - -export DSPLINK="${S}" - -PARALLEL_MAKE = "" - |