From 78d33a3c1a55b5f6cbf76a917c8bf6e56c670c94 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Thu, 19 Feb 2009 15:27:01 +0000 Subject: dsplink, codec-engine: restructuring and packaging improvements --- packages/dsplink/ti-codec-engine_2.21.bb | 223 +++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 packages/dsplink/ti-codec-engine_2.21.bb (limited to 'packages/dsplink/ti-codec-engine_2.21.bb') diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb new file mode 100644 index 0000000000..1c82e53971 --- /dev/null +++ b/packages/dsplink/ti-codec-engine_2.21.bb @@ -0,0 +1,223 @@ +require dsplink.inc + +DESCRIPTION = "Codec Engine for TI ARM/DSP processors" + +DEPENDS = "virtual/kernel perl-native" +RDEPENDS = "update-modules" + +inherit module + +# tconf from xdctools dislikes '.' in pwd :/ +PR = "r9" +PV = "221" + +# Get CE tarball from TI website, place in sources and calculate +# md5sum +# Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html + +SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ + file://cmem-class-device-27-and-sched-include-fix.patch;patch=1 \ + file://dsplink-semaphore-27.patch;patch=1 \ + file://lpm-device-create-and-semaphore-include-fix.patch;patch=1 \ + file://lpm-make-symbol-warnings-fix.patch;patch=1 \ + file://Makefile-dsplink-gpp \ + file://Makefile-dsplink-dsp \ +" + +S = "${WORKDIR}/codec_engine_2_21" + +require ti-paths.inc + +export DSPLINK="${S}/cetools/packages/dsplink" + +PARALLEL_MAKE = "" + +# the include files on top define do_compile for the submodules +do_compile_append() { + +#dsplink already done from inclusion of require dsplink.inc + +#lpm bits + if [ -e ${S}/cetools/packages/ti/bios/power/ ] ; then + + # Build the DSP power manager kernel module + cd ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm + + # Still need to move this into the patch file + if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 26 ] ; then + sed -i -e s:asm/semaphore:linux/semaphore: lpm_driver.c + fi + + #what is this for? + rm -f *o + + # lpm also needs KERNEL_INSTALL_DIR and MVTOOL_PREFIX which come from ti-paths.inc + export DSPLINK_REPO=${DSPLINK}/.. + # should move the clean step into the clean stage.. + #oe_runmake clean + oe_runmake + fi + +#cmemk bits + if [ -e ${S}/cetools/packages/ti/sdo/linuxutils/cmem ] ; then + echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make + echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make + echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make + #export DSPLINK=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink + + # Build the cmem kernel module + # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + + cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem + oe_runmake clean + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" + fi + +#need to add other modules here, like SDMA, etc + + +#now build the CE examples + cd ${S}/examples + + # Fix paths to arm crosstools, c6x codegen and x86 gcc + # Also disable uclibc and x86 builds + sed -i -e s:/db/toolsrc/library/tools/vendors/cs/arm/arm-2007q3:${CROSS_DIR}:g \ + -e s:/db/toolsrc/library/tools/vendors/ti/c6x/6.0.16/Linux:${TITOOLSDIR}/${TICGTOOLSDIR}:g \ + -e s:/db/toolsrc/library/tools/vendors/opensource/gcc/4.1.0/Linux/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu:/usr:g \ + -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \ + -e 's:true, // build for uC Linux:false,:g' \ + -e 's:true, // build for PC Linux:false,:g' \ + ${S}/examples/user.bld + + # For now, remove all targets, except dm6446 and omap3530 + sed -i \ + -e '/evmDM357/d' \ + -e '/evmDM6467/d' \ + -e '/evmDM355/d' \ + -e '/evmDM6437/d' \ + -e '/evmDM648/d' \ + -e '/sdp3430/d' \ + -e '/evm2530/d' \ + ${S}/examples/user.bld + + # Fix path to c6x codegen + sed -i -e s:/db/toolsrc/library/tools/vendors/ti/c6x/6.0.16/Linux:${TITOOLSDIR}/${TICGTOOLSDIR}:g \ + xdcpaths.mak + + # Start building the CE examples: codecs, extensions, servers (codec bundles) and ARM side apps + # the DSP side uses CC to point to the c6x codegen, but would get the gcc tool + unset CC + + # Make clean doesn't do what you'd expect, it only cleans stuff you've enabled, so some cruft remains + + # First clean + for i in codecs extensions servers apps ; do + make -e -C ${S}/examples/ti/sdo/ce/examples/$i clean + done + + # Then build the examples + for i in codecs extensions servers apps ; do + make -e -C ${S}/examples/ti/sdo/ce/examples/$i + done +} + +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 + #install -d ${D}/${libdir} + #install -m 0755 ${DSPLINK}/gpp/BUILD/EXPORT/RELEASE/dsplink.lib ${D}/${libdir} + + #sample apps - this is very 64x / v5T specific at the moment - we really need CE to give us this list... + install -d ${D}/${datadir}/ti-codec-engine + # we change pwd so that find gives us relative path to the files, which we use to create the same structure on the target + cd ${S}/examples/ti/sdo/ce + + # first find all the app files named '.out' + for i in $(find . -name "*.out") ; do + # first create the directory + install -d ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + # now copy the file + install ${i} ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + done + + # next find all the app files named '.xv5T' + for i in $(find . -name "*.xv5T") ; do + # first create the directory + install -d ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + # now copy the file + install ${i} ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + done + + # then find all the app/server files named '.x64P' + for i in $(find . -name "*.x64P") ; do + # first create the directory + install -d ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + # now copy the file + install ${i} ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + done + + # finally find all the app files named '.dat' + for i in $(find . -name "*.dat") ; do + # first create the directory + install -d ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + # now copy the file + install ${i} ${D}/${datadir}/ti-codec-engine/`dirname ${i}` + done + + # finally, strip targets that we're not supporting here + # - TODO... +} + +#FILES_${PN} = "${base_sbindir}" + +PACKAGES =+ "ti-lpm-module ti-cmem-module" + +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" +FILES_ti-codec-engine-apps = "${datadir}/ti-codec-engine/*" + +pkg_postinst_ti-lpm-module () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_ti-lpm-module () { + update-modules || true +} + +pkg_postinst_ti-cmemk-module () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_ti-cmem-module () { + update-modules || true +} + +INHIBIT_PACKAGE_STRIP = "1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +#legacy upgrade helpers +RPROVIDES_ti-cmem-module += "ti-cmemk-module" + +#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" + -- cgit 1.2.3-korg From 614fd4e35e93eee768f406ecb040be34bd42e19b Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Thu, 19 Feb 2009 18:07:31 +0000 Subject: dmai: Repackaging for codec-combos and dmai, remove dsplink recipe that isn't needed anymore --- packages/dsplink/dmai_1.20.bb | 60 ------------------- packages/dsplink/omap3530-dvsdk-combos_3.16.bb | 40 ------------- packages/dsplink/ti-codec-combos_3.16.bb | 57 ++++++++++++++++++ packages/dsplink/ti-codec-engine_2.21.bb | 16 ++--- packages/dsplink/ti-dmai_1.20.bb | 81 ++++++++++++++++++++++++++ packages/dsplink/ti-dsplink_1.60.bb | 25 -------- 6 files changed, 147 insertions(+), 132 deletions(-) delete mode 100644 packages/dsplink/dmai_1.20.bb delete mode 100644 packages/dsplink/omap3530-dvsdk-combos_3.16.bb create mode 100644 packages/dsplink/ti-codec-combos_3.16.bb create mode 100644 packages/dsplink/ti-dmai_1.20.bb delete mode 100644 packages/dsplink/ti-dsplink_1.60.bb (limited to 'packages/dsplink/ti-codec-engine_2.21.bb') diff --git a/packages/dsplink/dmai_1.20.bb b/packages/dsplink/dmai_1.20.bb deleted file mode 100644 index 656030995d..0000000000 --- a/packages/dsplink/dmai_1.20.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "Davinci (and OMAP) Multimedia Application Interface" -DEPENDS = "virtual/kernel codec-engine omap3530-dvsdk-combos" -LICENCE = "unknown" - -require ti-paths.inc - -# https://www-a.ti.com/downloads/sds_support/applications_packages/dmai/dmai_1_20_00_06/dmai_setuplinux_1_20_00_06.bin -# Install the above link and put the dmai_1_20_00_06.tar.gz file in the same directory as this recipe -SRC_URI = "file://dmai_1_20_00_06.tar.gz \ - file://dmai-update-cpu-name.patch;patch=1 \ - file://dmai-update-fb-display.patch;patch=1 \ - file://dmai-update-v4l2-display.patch;patch=1 \ - file://dmai-do-not-panic-on-mixer-failure.patch;patch=1 \ - file://dmai-support-32bit-align.patch;patch=1 \ - file://dmai-built-with-angstrom.patch;patch=1 \ - " - -S = "${WORKDIR}/dmai_1_20_00_06" -# Yes, the xdc stuff still breaks with a '.' in PWD -PV = "120" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -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" - -do_compile_prepend_omap3evm() { - -#temp removal of sources that fail to build - if [ -e packages/ti/sdo/dmai/linux/omap3530/Resize.c ]; then - rm packages/ti/sdo/dmai/linux/omap3530/Resize.c - fi - - if [ -e packages/ti/sdo/dmai/linux/omap3530/Framecopy_accel.c ]; then - rm packages/ti/sdo/dmai/linux/omap3530/Framecopy_accel.c - fi -} - -do_compile() { - cd packages/ti/sdo/dmai - oe_runmake clean - oe_runmake ${TARGET} C_FLAGS="-O2 -I${STAGING_INCDIR}" - cd apps - oe_runmake clean - oe_runmake ${TARGET} -} - -do_install () { - echo oe_runmake install -} - -do_stage () { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dmai - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dmai -} diff --git a/packages/dsplink/omap3530-dvsdk-combos_3.16.bb b/packages/dsplink/omap3530-dvsdk-combos_3.16.bb deleted file mode 100644 index 278d743c28..0000000000 --- a/packages/dsplink/omap3530-dvsdk-combos_3.16.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Codec combos for omap3530" -DEPENDS = "codec-engine" -LICENCE = "unknown" - -require ti-paths.inc - -# TODO update this... -# https://www-a.ti.com/downloads/sds_support/applications_packages/dmai/dmai_1_20_00_06/dmai_setuplinux_1_20_00_06.bin -# Install the above link and put the omap3530_dvsdk_combos_3_16.tar.gz file in the same directory as this recipe -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}" - -TARGET = "all" - -export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools" - -do_compile() { - sed -i -e s:/db/toolsrc/library/vendors2005/ti/c6x/6.0.16/Linux:${TITOOLSDIR}/${TICGTOOLSDIR}:g \ - -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \ - -e s:/home/dvsdkval/workdir/OMAP3530/nfs/workdir/opt/toolchain/arm-2007q3:${CROSS_DIR}:g \ - ${S}/config.bld - - oe_runmake clean - oe_runmake -} - -do_install () { - echo oe_runmake install -} - -do_stage () { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecs - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecs -} diff --git a/packages/dsplink/ti-codec-combos_3.16.bb b/packages/dsplink/ti-codec-combos_3.16.bb new file mode 100644 index 0000000000..60a976f1c9 --- /dev/null +++ b/packages/dsplink/ti-codec-combos_3.16.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "Codec combos for omap3530" +DEPENDS = "ti-codec-engine" +LICENCE = "unknown" + +require ti-paths.inc + +# TODO update this... +# https://www-a.ti.com/downloads/sds_support/applications_packages/dmai/dmai_1_20_00_06/dmai_setuplinux_1_20_00_06.bin +# Install the above link and put the omap3530_dvsdk_combos_3_16.tar.gz file in the same directory as this recipe +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" +PR = "r10" + +TARGET = "all" + +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 \ + -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \ + -e s:/home/dvsdkval/workdir/OMAP3530/nfs/workdir/opt/toolchain/arm-2007q3:${CROSS_DIR}:g \ + ${S}/config.bld + + oe_runmake clean + oe_runmake +} + +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}/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/ti-dmai_1.20.bb b/packages/dsplink/ti-dmai_1.20.bb new file mode 100644 index 0000000000..d25daf6622 --- /dev/null +++ b/packages/dsplink/ti-dmai_1.20.bb @@ -0,0 +1,81 @@ +DESCRIPTION = "Davinci (and OMAP) Multimedia Application Interface" +DEPENDS = "virtual/kernel ti-codec-engine ti-codec-combos" +LICENCE = "unknown" + +require ti-paths.inc + +# https://www-a.ti.com/downloads/sds_support/applications_packages/dmai/dmai_1_20_00_06/dmai_setuplinux_1_20_00_06.bin +# Install the above link and put the dmai_1_20_00_06.tar.gz file in the same directory as this recipe +SRC_URI = "file://dmai_1_20_00_06.tar.gz \ + file://dmai-update-cpu-name.patch;patch=1 \ + file://dmai-update-fb-display.patch;patch=1 \ + file://dmai-update-v4l2-display.patch;patch=1 \ + file://dmai-do-not-panic-on-mixer-failure.patch;patch=1 \ + file://dmai-support-32bit-align.patch;patch=1 \ + file://dmai-built-with-angstrom.patch;patch=1 \ + " + +S = "${WORKDIR}/dmai_1_20_00_06" +# Yes, the xdc stuff still breaks with a '.' in PWD +PV = "120" +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}/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 on evm3530 + if [ -e packages/ti/sdo/dmai/linux/omap3530/Resize.c ]; then + rm packages/ti/sdo/dmai/linux/omap3530/Resize.c + fi + + if [ -e packages/ti/sdo/dmai/linux/omap3530/Framecopy_accel.c ]; then + rm packages/ti/sdo/dmai/linux/omap3530/Framecopy_accel.c + fi +} + +do_compile() { + cd packages/ti/sdo/dmai + oe_runmake clean + oe_runmake ${TARGET} C_FLAGS="-O2 -I${STAGING_INCDIR}" + cd apps + oe_runmake clean + oe_runmake ${TARGET} +} + +do_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}/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 = "" - -- cgit 1.2.3-korg From 6a3859b78342e9a58e1c92a117a0c6e9b851a517 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 20 Feb 2009 08:44:34 +0100 Subject: ti-codec-engine: also add RREPLACES --- packages/dsplink/ti-codec-engine_2.21.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/dsplink/ti-codec-engine_2.21.bb') diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb index 2eaa40c0e9..80e6fb8c82 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 = "r10" +PR = "r11" PV = "221" # Get CE tarball from TI website, place in sources and calculate @@ -216,6 +216,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #legacy upgrade helpers RPROVIDES_ti-cmem-module += "ti-cmemk-module" +RREPLACES_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" -- cgit 1.2.3-korg From f0eb06723002da557afffea96b257904ac007cbf Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 20 Feb 2009 10:31:35 +0000 Subject: codec-engine: Added RREPLACES for dsplink packages - bumped PR --- packages/dsplink/dsplink.inc | 2 ++ packages/dsplink/ti-codec-engine_2.21.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/dsplink/ti-codec-engine_2.21.bb') diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc index 09c8759768..1ca01c399c 100644 --- a/packages/dsplink/dsplink.inc +++ b/packages/dsplink/dsplink.inc @@ -103,7 +103,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #legacy upgrade helpers RPROVIDES_ti-dsplink-module += "dsplink-module" +RREPLACES_ti-dsplink-module += "dsplink-module" RPROVIDES_ti-dsplink-apps += "dsplink-apps" +RREPLACES_ti_dsplink-apps += "dsplink-apps" #add run-time dependencies - note for kernel module we can only use RRECOMMENDS, since modules might be built into the kernel RRECOMMENDS_ti-dsplink-apps += "ti-dsplink-module" diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb index 80e6fb8c82..e3eda39f5a 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 = "r11" +PR = "r12" PV = "221" # Get CE tarball from TI website, place in sources and calculate -- cgit 1.2.3-korg From c0ee8e8641a46803fd83c7689c476789415f7dde Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 20 Feb 2009 13:18:22 +0000 Subject: codec-engine: Added-scripts for loading/unloading modules for running dsplink/ce/dmai test apps Signed-off-by: Koen Kooi --- .../files/loadmodules-ti-codec-engine-apps.sh | 37 ++++++++++++++++++++++ packages/dsplink/files/loadmodules-ti-dmai-apps.sh | 37 ++++++++++++++++++++++ .../dsplink/files/loadmodules-ti-dsplink-apps.sh | 25 +++++++++++++++ .../files/unloadmodules-ti-codec-engine-apps.sh | 12 +++++++ .../dsplink/files/unloadmodules-ti-dmai-apps.sh | 12 +++++++ .../dsplink/files/unloadmodules-ti-dsplink-apps.sh | 5 +++ packages/dsplink/ti-codec-engine_2.21.bb | 15 ++++++++- packages/dsplink/ti-dmai_1.20.bb | 8 ++++- 8 files changed, 149 insertions(+), 2 deletions(-) create mode 100755 packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh create mode 100755 packages/dsplink/files/loadmodules-ti-dmai-apps.sh create mode 100755 packages/dsplink/files/loadmodules-ti-dsplink-apps.sh create mode 100755 packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh create mode 100755 packages/dsplink/files/unloadmodules-ti-dmai-apps.sh create mode 100755 packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh (limited to 'packages/dsplink/ti-codec-engine_2.21.bb') diff --git a/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh b/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh new file mode 100755 index 0000000000..743a07ebba --- /dev/null +++ b/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh @@ -0,0 +1,37 @@ +# +# Default Memory Map - for OMAP3530 CE 2.21 examples +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 80 MB Linux +# 0x85000000 08 MB CMEM +# 0x86000000 24 MB DDRALGHEAP +# 0x87800000 6 MB DDR2 (BIOS, Codecs, Applications) +# 0x87E00000 1 MB DSPLINK (MEM) +# 0x87F00000 4 KB DSPLINK (RESET) +# 0x87F01000 1020 KB unused + +# sanity check to verify that we're using the right mem=xxM (80M in this case) +awk '/MemTotal:/ { + mem=$2 + + if (mem > 80 * 1024) + print "Warning! You need to use mem=80M or less on the kernel cmdline" + + printf "You have %dkB total memory for Linux\n", mem +}' /proc/meminfo + +# Select cmemk parameters for best fit, i.e. starting at 0x85000000 +modprobe cmemk phys_start=0x85000000 phys_end=0x86000000 pools=20x4096,8x131072,5x1048576,1x1429440,1x256000,1x3600000,5x829440 + +# insert DSP/BIOS Link driver +# +modprobe dsplinkk + +# make /dev/dsplink +rm -f /dev/dsplink +mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 + +# insert Local Power Manager driver +# +modprobe lpm_omap3530 diff --git a/packages/dsplink/files/loadmodules-ti-dmai-apps.sh b/packages/dsplink/files/loadmodules-ti-dmai-apps.sh new file mode 100755 index 0000000000..af4cef9f3f --- /dev/null +++ b/packages/dsplink/files/loadmodules-ti-dmai-apps.sh @@ -0,0 +1,37 @@ +# +# Default Memory Map - for OMAP3530 dvsdk examples from 3.00.00.29 - this memory map is used for DMAI apps +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 88 MB Linux +# 0x85800000 08 MB CMEM +# 0x86800000 16 MB DDRALGHEAP +# 0x87800000 6 MB DDR2 (BIOS, Codecs, Applications) +# 0x87E00000 1 MB DSPLINK (MEM) +# 0x87F00000 4 KB DSPLINK (RESET) +# 0x87F01000 1020 KB unused + +# sanity check to verify that we're using the right mem=xxM (88M in this case) +awk '/MemTotal:/ { + mem=$2 + + if (mem > 88 * 1024) + print "Warning! You need to use mem=88M or less on the kernel cmdline" + + printf "You have %dkB total memory for Linux\n", mem +}' /proc/meminfo + +# Select cmemk parameters for best fit, i.e. starting at 0x85000000 +modprobe cmemk phys_start=0x85800000 phys_end=0x86800000 pools=20x4096,8x131072,5x1048576,1x1429440,1x256000,1x3600000,5x829440 + +# insert DSP/BIOS Link driver +# +modprobe dsplinkk + +# make /dev/dsplink +rm -f /dev/dsplink +mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 + +# insert Local Power Manager driver +# +modprobe lpm_omap3530 diff --git a/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh b/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh new file mode 100755 index 0000000000..c93b637867 --- /dev/null +++ b/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh @@ -0,0 +1,25 @@ +# +# Default Memory Map - for OMAP3530 dsplink examples +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 126 MB Linux +# 0x87E00000 2 MB DSPLINK (MEM) + DDR + DSPLINK (RESET) + +# sanity check to verify that we're using the right mem=xxM (126M in this case) +awk '/MemTotal:/ { + mem=$2 + + if (mem > 126 * 1024) + print "Warning! You need to use mem=126M or less on the kernel cmdline" + + printf "You have %dkB total memory for Linux\n", mem +}' /proc/meminfo + +# insert DSP/BIOS Link driver +# +modprobe dsplinkk + +# make /dev/dsplink +rm -f /dev/dsplink +mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 diff --git a/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh b/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh new file mode 100755 index 0000000000..17436a5937 --- /dev/null +++ b/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh @@ -0,0 +1,12 @@ +# Unload modules - CODEC ENGINE - OMAP3530 + +# remove lpm module +rmmod lpm_omap3530 + +# remove DSP/BIOS Link driver +rmmod dsplinkk +rm -f /dev/dsplink + +# remove cmem module +rmmod cmemk + diff --git a/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh b/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh new file mode 100755 index 0000000000..2465c43fe9 --- /dev/null +++ b/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh @@ -0,0 +1,12 @@ +# Unload modules - DMAI - OMAP3530 + +# remove lpm module +rmmod lpm_omap3530 + +# remove DSP/BIOS Link driver +rmmod dsplinkk +rm -f /dev/dsplink + +# remove cmem module +rmmod cmemk + diff --git a/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh b/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh new file mode 100755 index 0000000000..8694114a70 --- /dev/null +++ b/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh @@ -0,0 +1,5 @@ +# Unload modules - DSPLINK - OMAP3530 + +# remove DSP/BIOS Link driver +rmmod dsplinkk +rm -f /dev/dsplink diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb index e3eda39f5a..b87deadaa9 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 = "r12" +PR = "r13" PV = "221" # Get CE tarball from TI website, place in sources and calculate @@ -22,6 +22,10 @@ SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ file://lpm-make-symbol-warnings-fix.patch;patch=1 \ file://Makefile-dsplink-gpp \ file://Makefile-dsplink-dsp \ + file://loadmodules-ti-dsplink-apps.sh \ + file://unloadmodules-ti-dsplink-apps.sh \ + file://loadmodules-ti-codec-engine-apps.sh \ + file://unloadmodules-ti-codec-engine-apps.sh \ " S = "${WORKDIR}/codec_engine_2_21" @@ -142,6 +146,11 @@ do_install_append () { # we change pwd so that find gives us relative path to the files, which we use to create the same structure on the target cd ${S}/examples/ti/sdo/ce + #test app module un/load scripts + install ${WORKDIR}/loadmodules-ti-dsplink-apps.sh ${D}/${datadir}/ti-dsplink + install ${WORKDIR}/unloadmodules-ti-dsplink-apps.sh ${D}/${datadir}/ti-dsplink + + #ce samples # first find all the app files named '.out' for i in $(find . -name "*.out") ; do # first create the directory @@ -174,6 +183,10 @@ do_install_append () { install ${i} ${D}/${datadir}/ti-codec-engine/`dirname ${i}` done + #test app module un/load scripts + install ${WORKDIR}/loadmodules-ti-codec-engine-apps.sh ${D}/${datadir}/ti-codec-engine + install ${WORKDIR}/unloadmodules-ti-codec-engine-apps.sh ${D}/${datadir}/ti-codec-engine + # we should install the CMEM apps as well here # finally, strip targets that we're not supporting here diff --git a/packages/dsplink/ti-dmai_1.20.bb b/packages/dsplink/ti-dmai_1.20.bb index 87dcb38fd9..830143c7f2 100644 --- a/packages/dsplink/ti-dmai_1.20.bb +++ b/packages/dsplink/ti-dmai_1.20.bb @@ -13,12 +13,14 @@ SRC_URI = "file://dmai_1_20_00_06.tar.gz \ file://dmai-do-not-panic-on-mixer-failure.patch;patch=1 \ file://dmai-support-32bit-align.patch;patch=1 \ file://dmai-built-with-angstrom.patch;patch=1 \ + file://loadmodules-ti-dmai-apps.sh \ + file://unloadmodules-ti-dmai-apps.sh \ " S = "${WORKDIR}/dmai_1_20_00_06" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "120" -PR = "r11" +PR = "r12" TARGET = "all" TARGET_neuros-osd2 = " dm6446_al dm6446_db" @@ -55,6 +57,10 @@ do_install () { export EXEC_DIR="${D}/${datadir}/ti-dmai/apps" oe_runmake install + + #test app module un/load scripts + install ${WORKDIR}/loadmodules-ti-dmai-apps.sh ${D}/${datadir}/ti-dmai + install ${WORKDIR}/unloadmodules-ti-dmai-apps.sh ${D}/${datadir}/ti-dmai } do_stage () { -- cgit 1.2.3-korg From b3f33ba5ab7caf583a6055045633857eebae8568 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 20 Feb 2009 15:33:10 +0000 Subject: codec-engine: Added SDMA linuxutils build and package, minor DSPLINK DIRSEP fix Signed-off-by: Koen Kooi --- packages/dsplink/files/Makefile-dsplink-gpp | 2 +- .../files/sdma-class-device-and-includes-fix.patch | 59 ++++++++++++++++++++++ packages/dsplink/ti-codec-engine_2.21.bb | 48 +++++++++++++++--- 3 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 packages/dsplink/files/sdma-class-device-and-includes-fix.patch (limited to 'packages/dsplink/ti-codec-engine_2.21.bb') diff --git a/packages/dsplink/files/Makefile-dsplink-gpp b/packages/dsplink/files/Makefile-dsplink-gpp index e69ce75f19..d9f2f6209a 100755 --- a/packages/dsplink/files/Makefile-dsplink-gpp +++ b/packages/dsplink/files/Makefile-dsplink-gpp @@ -29,7 +29,7 @@ SOURCES := include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP)SOURCES PMGR_SOURCES += $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP),$(SOURCES)) SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(DIRSEP)SOURCES +include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)SOURCES OSAL_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(DIRSEP),$(SOURCES)) SOURCES := include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)SOURCES diff --git a/packages/dsplink/files/sdma-class-device-and-includes-fix.patch b/packages/dsplink/files/sdma-class-device-and-includes-fix.patch new file mode 100644 index 0000000000..2dcc7a3b7e --- /dev/null +++ b/packages/dsplink/files/sdma-class-device-and-includes-fix.patch @@ -0,0 +1,59 @@ +diff -uNr codec_engine_2_21/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c codec_engine_2_21_fix/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c +--- codec_engine_2_21/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c 2009-02-20 14:49:41.000000000 +0000 ++++ codec_engine_2_21_fix/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c 2009-02-20 15:07:59.000000000 +0000 +@@ -17,6 +17,7 @@ + /* + * sdmak.c + */ ++#include + #include + #include + #include +@@ -32,14 +33,20 @@ + #include + #include + #include +- +-#include + #include + #include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) ++#include + #include + #include +-#include + #include ++#else ++#include ++#include ++#include ++#include ++#endif ++#include + + #include "../interface/sdma.h" + +@@ -229,7 +236,11 @@ + __D("sdma registered major = %d\n", major); + + dma_class = class_create(THIS_MODULE, "sdma"); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) + class_device_create(dma_class, NULL, MKDEV(major, 0), NULL, "sdma"); ++#else ++ device_create(dma_class, NULL, MKDEV(major, 0), NULL, "sdma"); ++#endif + + for (channel = 0; channel < SDMA_NUMCHANNELS; channel++) { + channels[channel].owner = NULL; +@@ -248,7 +259,11 @@ + omap_free_dma(channel); + } + } ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) + class_device_destroy(dma_class, MKDEV(major, 0)); ++#else ++ device_destroy(dma_class, MKDEV(major, 0)); ++#endif + class_destroy(dma_class); + unregister_chrdev(major, "sdma"); + diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb index b87deadaa9..805715bd74 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 = "r13" +PR = "r14" PV = "221" # Get CE tarball from TI website, place in sources and calculate @@ -17,6 +17,7 @@ PV = "221" SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ file://cmem-class-device-27-and-sched-include-fix.patch;patch=1 \ + file://sdma-class-device-and-includes-fix.patch;patch=1 \ file://dsplink-semaphore-27.patch;patch=1 \ file://lpm-device-create-and-semaphore-include-fix.patch;patch=1 \ file://lpm-make-symbol-warnings-fix.patch;patch=1 \ @@ -69,7 +70,7 @@ do_compile_append() { echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make #export DSPLINK=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink - # Build the cmem kernel module + # Build the cmem kernel module and associated test apps # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS @@ -82,7 +83,27 @@ do_compile_append() { AR="${KERNEL_AR}" fi -#need to add other modules here, like SDMA, etc +#sdma bits + if [ -e ${S}/cetools/packages/ti/sdo/linuxutils/sdma ] ; then + echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make + echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make + echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make + + # Build the sdma kernel module and associated test apps + # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + + cd ${S}/cetools/packages/ti/sdo/linuxutils/sdma + oe_runmake clean + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" + fi + + +#need to add other modules here, like IRQ, etc #now build the CE examples @@ -134,8 +155,9 @@ do_compile_append() { 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 cp ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true + cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true + cp ${S}/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true #library #install -d ${D}/${libdir} @@ -193,10 +215,11 @@ do_install_append () { # - TODO... } -PACKAGES =+ "ti-lpm-module ti-cmem-module ti-codec-engine-apps" +PACKAGES =+ "ti-lpm-module ti-cmem-module ti-sdma-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" +FILES_ti-sdma-moduke = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/sdmak.ko" FILES_ti-codec-engine-apps = "${datadir}/ti-codec-engine/*" pkg_postinst_ti-lpm-module () { @@ -223,6 +246,18 @@ pkg_postrm_ti-cmem-module () { update-modules || true } +pkg_postinst_ti-sdma-module () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_ti-sdma-module () { + update-modules || true +} + INHIBIT_PACKAGE_STRIP = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -231,10 +266,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" RPROVIDES_ti-cmem-module += "ti-cmemk-module" RREPLACES_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" +RRECOMMENDS_ti-codec-engine-apps += "ti-dsplink-module ti-lpm-module ti-cmem-module ti-sdma-module" -- cgit 1.2.3-korg