diff options
Diffstat (limited to 'recipes/dvsdk')
26 files changed, 191 insertions, 61 deletions
diff --git a/recipes/dvsdk/gstreamer-ti_svn.bb b/recipes/dvsdk/gstreamer-ti_svn.bb index 85d85e0467..6eeffd0225 100644 --- a/recipes/dvsdk/gstreamer-ti_svn.bb +++ b/recipes/dvsdk/gstreamer-ti_svn.bb @@ -10,12 +10,14 @@ SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto= " # Again, no '.' in PWD allowed :( -PR = "r17" +PR = "r23" PV = "svnr${SRCREV}" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" -installdir = "${prefix}/ti" +installdir = "${datadir}/ti" + +META_SDK_PATH ?= "${CROSS_DIR}" DMAI_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai" CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine" @@ -52,9 +54,9 @@ PLATFORM_beagleboard = "omap3530" export PLATFORM -CROSS_COMPILE = "${CROSS_DIR}/bin/${TARGET_PREFIX}" -CSTOOL_DIR = "${CROSS_DIR}" -MVTOOL_DIR = "${CROSS_DIR}" +CROSS_COMPILE=${META_SDK_PATH}/bin/${TARGET_PREFIX} +CSTOOL_DIR=${META_SDK_PATH} +MVTOOL_DIR=${META_SDK_PATH} export CROSS_COMPILE export CSTOOL_DIR export MVTOOL_DIR @@ -72,6 +74,9 @@ do_install_prepend () { # default loadmodule script is hard-coded for insmod, change to modprobe sed -i 's/insmod/modprobe/g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh sed -i 's/.ko//g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh + if [ "${PLATFORM}" = "omap3530" ]; then + echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh + fi chmod 0755 ${D}/${installdir}/gst -R } diff --git a/recipes/dvsdk/readme.txt b/recipes/dvsdk/readme.txt index 8dd71e6fee..daf7bf6be5 100644 --- a/recipes/dvsdk/readme.txt +++ b/recipes/dvsdk/readme.txt @@ -1,10 +1,5 @@ -placeholder for readme -todo with this package -- rename top level dsplink directory -- repartion code into different recipes - create codecengine-examples package -/DONE - fix lpm build to pick up Module.symversion -- cleanup device selection script - not good to just /d the targets - need cleaner solution -- staging needs work +The software needed can be downloaded from: +* http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/ +* https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm -- add ce 2.22 diff --git a/recipes/dvsdk/ti-cgt6x-native_6.0.16.bb b/recipes/dvsdk/ti-cgt6x-native_6.0.21.bb index 310662435f..d980f46c16 100644 --- a/recipes/dvsdk/ti-cgt6x-native_6.0.16.bb +++ b/recipes/dvsdk/ti-cgt6x-native_6.0.21.bb @@ -1,13 +1,15 @@ require ti-cgt6x.inc inherit native -SRC_URI = "http://install.source.dir.com/TI-C6x-CGT-v6.0.16-eval.tar.gz" +SRC_URI = "http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin" -S = "${WORKDIR}/cg6x_6_0_16" +BINFILE="ti_cgt_c6000_6.0.21_setup_linux_x86.bin" + +S = "${WORKDIR}/cgt" # Yes, the xdc stuff still breaks with a '.' in PWD -PV = "6016" -PR = "r12" +PV = "6021" +PR = "r3" do_stage() { install -d ${STAGING_DIR_NATIVE}/${PN} diff --git a/recipes/dvsdk/ti-cgt6x-sdk_6.0.16.bb b/recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb index 52b99b4eb0..f0ad126ac4 100644 --- a/recipes/dvsdk/ti-cgt6x-sdk_6.0.16.bb +++ b/recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb @@ -1,26 +1,26 @@ require ti-cgt6x.inc inherit sdk -SRC_URI = "http://install.source.dir.com/TI-C6x-CGT-v6.0.16-eval.tar.gz" +SRC_URI = "http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin" -S = "${WORKDIR}/cg6x_6_0_16" +S = "${WORKDIR}/cgt" # Yes, the xdc stuff still breaks with a '.' in PWD -PV = "6016" -PR = "r12" +PV = "6021" +PR = "r3" do_install() { - install -d ${D}/${prefix}/dvsdk/cg6x_6_0_16 - cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/cg6x_6_0_16 + install -d ${D}/${prefix}/dvsdk/cg6x_6_0_21 + cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/cg6x_6_0_21 # Creates rules.make file mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules echo "# Where the TI C6x codegen tool is installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make - echo "CODEGEN_INSTALL_DIR=${prefix}/dvsdk/cg6x_6_0_16" >> ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make + echo "CODEGEN_INSTALL_DIR=${prefix}/dvsdk/cg6x_6_0_21" >> ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make echo "" >> ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make } INHIBIT_PACKAGE_STRIP = "1" -FILES_${PN} = "${prefix}/dvsdk/cg6x_6_0_16" +FILES_${PN} = "${prefix}/dvsdk/cg6x_6_0_21" INSANE_SKIP_${PN} = True diff --git a/recipes/dvsdk/ti-cgt6x.inc b/recipes/dvsdk/ti-cgt6x.inc index ad76cfe31f..35a9252cfe 100644 --- a/recipes/dvsdk/ti-cgt6x.inc +++ b/recipes/dvsdk/ti-cgt6x.inc @@ -1,2 +1,42 @@ DESCRIPTION = "Code Generation Tools for TI DaVinci and OMAP" +# This file defines function used for extracting .bin file + +python do_unpack () { + bb.build.exec_func('base_do_unpack', d) + bb.build.exec_func('ti_bin_do_unpack', d) +} + +python ti_bin_do_unpack() { + + import os + + localdata = bb.data.createCopy(d) + bb.data.update_data(localdata) + + binfile = bb.data.getVar('BINFILE', localdata) + + # Change to the working directory + save_cwd = os.getcwd() + workdir = bb.data.getVar('WORKDIR', localdata) + workdir = bb.data.expand(workdir, localdata) + os.chdir(workdir) + + # Make the InstallJammer binary executable so we can run it + os.chmod(binfile, 0755) + + # Run the InstallJammer binary and accept the EULA + filename = "HOME=%s ./%s" % (workdir, binfile) + f = os.popen(filename,'w') + print >>f, "Y\n" + print >>f, "qY\n" + print >>f, "%s/cgt\n" % workdir + print >>f, " \n" + print >>f, " \n" + + f.close() + + # Return to the previous directory + os.chdir(save_cwd) +} + diff --git a/recipes/dvsdk/ti-cmem-module_2.23.1.bb b/recipes/dvsdk/ti-cmem-module_2.23.1.bb index 097319c722..f02383d980 100644 --- a/recipes/dvsdk/ti-cmem-module_2.23.1.bb +++ b/recipes/dvsdk/ti-cmem-module_2.23.1.bb @@ -5,12 +5,16 @@ inherit module DEPENDS = "virtual/kernel perl-native" RDEPENDS = "update-modules" +# Download codec_engine_2_23_01.tar.gz from +# https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html + SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz" # Set the source directory S = "${WORKDIR}/codec_engine_2_23_01" -PR = "r18" +#This is a kernel module, don't set PR directly +MACHINE_KERNEL_PR_append = "a" PV = "2231" do_compile() { @@ -38,7 +42,7 @@ do_install () { LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \ MVTOOL_PREFIX="${TARGET_PREFIX}" \ UCTOOL_PREFIX="${TARGET_PREFIX}" \ - EXEC_DIR="${D}${prefix}/ti/ti-cmem-apps" \ + EXEC_DIR="${D}${datadir}/ti/ti-cmem-apps" \ install } @@ -57,7 +61,7 @@ pkg_postrm () { INHIBIT_PACKAGE_STRIP = "1" FILES_${PN} = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/cmemk.ko" PACKAGES += " ti-cmem-apps" -FILES_ti-cmem-apps = "${prefix}/ti/ti-cmem-apps/*" +FILES_ti-cmem-apps = "${datadir}/ti/ti-cmem-apps/*" INSANE_SKIP_ti-cmem-apps = True diff --git a/recipes/dvsdk/ti-cmem-module_2.23.bb b/recipes/dvsdk/ti-cmem-module_2.23.bb index 15f8af349e..60324fbc30 100644 --- a/recipes/dvsdk/ti-cmem-module_2.23.bb +++ b/recipes/dvsdk/ti-cmem-module_2.23.bb @@ -10,7 +10,8 @@ SRC_URI = "http://install.source.dir.com/codec_engine_2_23.tar.gz" # Set the source directory S = "${WORKDIR}/codec_engine_2_23" -PR = "r11" +#This is a kernel module, don't set PR directly +MACHINE_KERNEL_PR_append = "a" PV = "223" do_compile() { diff --git a/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb b/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb index 3a63faf7e7..05952d2a6a 100644 --- a/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb +++ b/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb @@ -12,7 +12,7 @@ BINFILE="dm355_codecs_setuplinux_1_13_000.bin" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "113" -PR = "r13" +PR = "r16" do_compile() { echo "Do nothing" diff --git a/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb b/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb index 3827a1f7e1..cfc1c9005a 100644 --- a/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb +++ b/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb @@ -7,11 +7,11 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dv S = "${WORKDIR}/dm355_codecs_1_13_000" BINFILE="dm355_codecs_setuplinux_1_13_000.bin" -installdir = "${prefix}/ti" +installdir = "${datadir}/ti" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "113" -PR = "r12" +PR = "r15" do_compile() { echo "Do nothing" diff --git a/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb b/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb new file mode 100644 index 0000000000..f02d49a048 --- /dev/null +++ b/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "DM6446 Codec Combo 2.05" +inherit sdk + +# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation. +SRC_URI = "ftp://install.source.dir.com/dm6446_dvsdk_combos_2_05.tar.gz" + +S = "${WORKDIR}/dm6446_dvsdk_combos_2_05" + +# Yes, the xdc stuff still breaks with a '.' in PWD +PV = "205" +PR = "r10" + +# DM6446 combo has Makefile. We don't want to rebuild anything here. +do_compile() { + echo "do nothing" +} + +do_install() { + install -d ${D}/${prefix}/dvsdk/dm6446_dvsdk_combos_2_05 + cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/dm6446_dvsdk_combos_2_05 + + # Creates rules.make file + mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules + echo "# Where the codec servers are installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make + echo "CODEC_INSTALL_DIR=${prefix}/dvsdk/dm6446_dvsdk_combos_2_05" >> ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make +} + +INHIBIT_PACKAGE_STRIP = "1" +INSANE_SKIP_${PN} = True +FILES_${PN} = "${prefix}/dvsdk/dm6446_dvsdk_combos_2_05/*" + diff --git a/recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb b/recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb new file mode 100644 index 0000000000..04f946bc19 --- /dev/null +++ b/recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "DM6446 Codec Combo 2.05" + +# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation. +SRC_URI = "http://install.source.dir.com/dm6446_dvsdk_combos_2_05.tar.gz" + +S = "${WORKDIR}/dm6446_dvsdk_combos_2_05" + +# Yes, the xdc stuff still breaks with a '.' in PWD +PV = "205" +PR = "r11" + +installdir = "${datadir}/ti" +do_compile() { + echo "do nothing" +} + +do_install () { + install -d ${D}/${installdir}/codec-combo + cd ${S} + for file in `find . -name *.x64P`; do + cp ${file} ${D}/${installdir}/codec-combo + done +} + +do_stage() { + install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN} + cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "/${installdir}/codec-combo/*" + diff --git a/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb b/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb index 0a396c7ba6..966e568af9 100644 --- a/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb +++ b/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/omap3530_dvsdk_combos_tspa_3_16_01" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "316" -PR = "r8" +PR = "r10" do_compile () { echo "No nothing" diff --git a/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb b/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb index 154527a700..76ebb46818 100644 --- a/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb +++ b/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb @@ -10,13 +10,33 @@ TARFILE = "omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa_3_16_01.tar.gz" S = "${WORKDIR}/omap3530_dvsdk_combos_tspa_3_16_01" +DEPENDS="ti-codec-engine" + +CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine" +FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" +LINK_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" +CMEM_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" +LPM_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" +BIOS_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native" +CODEGEN_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native" +XDC_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native" + +export ${CODEGEN_INSTALL_DIR} + # Yes, the xdc stuff still breaks with a '.' in PWD PV = "3161" -PR = "r9" -installdir = "${prefix}/ti" +PR = "r12" +installdir = "${datadir}/ti" do_compile() { - echo "Do not rebuild for now" + make CE_INSTALL_DIR=${CE_INSTALL_DIR} \ + FC_INSTALL_DIR=${FC_INSTALL_DIR} \ + LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \ + CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \ + LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \ + BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \ + CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \ + XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \ } do_install () { diff --git a/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb b/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb index 340a222315..4f9f6b9bf1 100644 --- a/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb +++ b/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Codec Engine 2.23.01 for TI ARM/DSP processors" inherit sdk # tconf from xdctools dislikes '.' in pwd :/ -PR = "r11" +PR = "r17" PV = "2231" SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz " diff --git a/recipes/dvsdk/ti-codec-engine_2.23.1.bb b/recipes/dvsdk/ti-codec-engine_2.23.1.bb index 3d06971a60..a553476427 100644 --- a/recipes/dvsdk/ti-codec-engine_2.23.1.bb +++ b/recipes/dvsdk/ti-codec-engine_2.23.1.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Codec Engine 2.23.01 for TI ARM/DSP processors" # compile time dependencies -DEPENDS_dm6446-evm += "ti-xdctools-native ti-cgt6x-native ti-dspbios-native ti-codec-combo-dm6446" -DEPENDS_omap3evm += "ti-cgt6x-native ti-dspbios-native ti-codec-combo-omap3530 ti-xdctools-native" -DEPENDS_beagleboard += "ti-cgt6x-native ti-dspbios-native ti-codec-combo-omap3530 ti-xdctools-native" -DEPENDS_dm355-evm += "ti-codec-combo-dm355 ti-xdctools-native" +DEPENDS_dm6446-evm += "ti-xdctools-native ti-cgt6x-native ti-dspbios-native" +DEPENDS_omap3evm += "ti-cgt6x-native ti-dspbios-native ti-xdctools-native" +DEPENDS_beagleboard += "ti-cgt6x-native ti-dspbios-native ti-xdctools-native" +DEPENDS_dm355-evm += "ti-xdctools-native" # tconf from xdctools dislikes '.' in pwd :/ -PR = "r13" +PR = "r16" PV = "2231" SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz " diff --git a/recipes/dvsdk/ti-dm355mm-module_1.13.bb b/recipes/dvsdk/ti-dm355mm-module_1.13.bb index cb8c39d021..0a2c6af14f 100644 --- a/recipes/dvsdk/ti-dm355mm-module_1.13.bb +++ b/recipes/dvsdk/ti-dm355mm-module_1.13.bb @@ -14,7 +14,8 @@ BINFILE="dm355_codecs_setuplinux_1_13_000.bin" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "113" -PR = "r15" +#This is a kernel module, don't set PR directly +MACHINE_KERNEL_PR_append = "a" do_configure() { find ${S} -name "*.ko" -exec rm {} \; || true diff --git a/recipes/dvsdk/ti-dmai.inc b/recipes/dvsdk/ti-dmai.inc index 497e65df25..d90a906cf9 100644 --- a/recipes/dvsdk/ti-dmai.inc +++ b/recipes/dvsdk/ti-dmai.inc @@ -2,7 +2,7 @@ DESCRIPTION = "DMAI for TI ARM/DSP processors" # NOTE: Use Brijesh' DMAI development branch. The URL *must* be updated once # we have stable DMAI 2.x on gforge. -SRCREV = "189" +SRCREV = "195" SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_031809;proto=https;user=anonymous;pswd='' \ file://loadmodules-ti-dmai-dm355_al.sh \ file://loadmodules-ti-dmai-dm6446_al.sh \ @@ -12,4 +12,5 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_031809;proto S = "${WORKDIR}/BRIJESH_GIT_031809/davinci_multimedia_application_interface" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "svnr${SRCREV}" +PR = "r27" diff --git a/recipes/dvsdk/ti-dmai_svn.bb b/recipes/dvsdk/ti-dmai_svn.bb index 0524fe6609..e089595086 100644 --- a/recipes/dvsdk/ti-dmai_svn.bb +++ b/recipes/dvsdk/ti-dmai_svn.bb @@ -8,7 +8,7 @@ DEPENDS_beagleboard += "alsa-lib ti-codec-engine ti-xdctools-native ti-dspbios- DEPENDS_dm6446-evm += "alsa-lib ti-codec-engine ti-xdctools-native ti-dspbios-native ti-cgt6x-native ti-codec-combo-dm6446 virtual/kernel " DEPENDS_dm355-evm += "alsa-lib ti-codec-engine ti-xdctools-native ti-codec-combo-dm355 virtual/kernel" -installdir = "${prefix}/ti" +installdir = "${datadir}/ti" # Define DMAI build time variables TARGET ?= "all" diff --git a/recipes/dvsdk/ti-dspbios-native_5.33.02.bb b/recipes/dvsdk/ti-dspbios-native_5.33.02.bb index 911eeda68c..e017a0366c 100644 --- a/recipes/dvsdk/ti-dspbios-native_5.33.02.bb +++ b/recipes/dvsdk/ti-dspbios-native_5.33.02.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/bios_5_33_02" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "533" -PR = "r11" +PR = "r13" do_stage() { install -d ${STAGING_DIR_NATIVE}/${PN} diff --git a/recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb b/recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb index a67ac238a8..da3657eed3 100644 --- a/recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb +++ b/recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/bios_5_33_02" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "533" -PR = "r11" +PR = "r13" do_install() { install -d ${D}/${prefix}/dvsdk/bios_5_33_02 diff --git a/recipes/dvsdk/ti-dsplink-module_1.61.3.bb b/recipes/dvsdk/ti-dsplink-module_1.61.3.bb index 764af7e6e8..492305f5c5 100644 --- a/recipes/dvsdk/ti-dsplink-module_1.61.3.bb +++ b/recipes/dvsdk/ti-dsplink-module_1.61.3.bb @@ -5,10 +5,11 @@ inherit module DEPENDS += " virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update-modules" # tconf from xdctools dislikes '.' in pwd :/ -PR = "r11" PV = "1613" +#This is a kernel module, don't set PR directly +MACHINE_KERNEL_PR_append = "a" -installdir = "${prefix}/ti" +installdir = "${datadir}/ti" SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz \ file://loadmodules-ti-dsplink-apps.sh \ file://unloadmodules-ti-dsplink-apps.sh" @@ -18,18 +19,12 @@ S = "${WORKDIR}/codec_engine_2_23_01" # DSPLINK - Config Variable for different platform DSPLINKPLATFORM ?= "DAVINCI" -DSPLINKPLATFORM_omap3evm ?= "OMAP3530" -DSPLINKPLATFORM_beagleboard ?= "OMAP3530" DSPLINKPLATFORM_dm6446-evm ?= "DAVINCI" DSPLINKDSPCFG ?= "DM6446GEMSHMEM" -DSPLINKDSPCFG_omap3evm ?= "OMAP3530SHMEM" -DSPLINKDSPCFG_beagleboard ?= "OMAP3530SHMEM" DSPLINKDSPCFG_dm6446-evm ?= "DM6446GEMSHMEM" DSPLINKGPPOS ?= "MVL5G" -DSPLINKGPPOS_omap3evm ?= "OMAPLSP" -DSPLINKGPPOS_beagleboard ?= "OMAPLSP" DSPLINKGPPOS_dm6446-evm ?= "MVL5G" export DSPLINK="${S}/cetools/packages/dsplink" @@ -153,7 +148,7 @@ INHIBIT_PACKAGE_STRIP = "1" PACKAGES += " ti-dsplink-apps" FILES_${PN} = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*" -FILES_ti-dsplink-apps = "/${installdir}/dsplink/*" +FILES_ti-dsplink-apps = "${installdir}/dsplink/*" # Disable QA check untils we figure out how to pass LDFLAGS in build INSANE_SKIP_${PN} = True diff --git a/recipes/dvsdk/ti-lpm-module_2.23.1.bb b/recipes/dvsdk/ti-lpm-module_2.23.1.bb index 790b7f99d0..8684fa1f97 100644 --- a/recipes/dvsdk/ti-lpm-module_2.23.1.bb +++ b/recipes/dvsdk/ti-lpm-module_2.23.1.bb @@ -4,8 +4,10 @@ inherit module # compile and run time dependencies DEPENDS = " virtual/kernel perl-native ti-dsplink-module" -PR = "r9" PV = "2231" +#This is a kernel module, don't set PR directly +MACHINE_KERNEL_PR_append = "a" + SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz " diff --git a/recipes/dvsdk/ti-rules-make-sdk.bb b/recipes/dvsdk/ti-rules-make-sdk.bb index b60e3a44a5..e1890bf606 100644 --- a/recipes/dvsdk/ti-rules-make-sdk.bb +++ b/recipes/dvsdk/ti-rules-make-sdk.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package creates Rules.make file and copies top label Makefil inherit sdk -PR="r4" +PR="r7" FILES=${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files/dvsdk-rules diff --git a/recipes/dvsdk/ti-sdma-module_2.23.1.bb b/recipes/dvsdk/ti-sdma-module_2.23.1.bb index 924a61866a..4c104a0c10 100644 --- a/recipes/dvsdk/ti-sdma-module_2.23.1.bb +++ b/recipes/dvsdk/ti-sdma-module_2.23.1.bb @@ -4,8 +4,9 @@ inherit module # compile and run time dependencies DEPENDS = "virtual/kernel perl-native" -PR = "r9" PV = "2231" +#This is a kernel module, don't set PR directly +MACHINE_KERNEL_PR_append = "a" SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz " diff --git a/recipes/dvsdk/ti-xdctools-native_3.10.03.bb b/recipes/dvsdk/ti-xdctools-native_3.10.03.bb index a41098e051..c37170ad7d 100644 --- a/recipes/dvsdk/ti-xdctools-native_3.10.03.bb +++ b/recipes/dvsdk/ti-xdctools-native_3.10.03.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/xdctools_3_10_03" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "310" -PR = "r14" +PR = "r16" do_stage() { install -d ${STAGING_DIR_NATIVE}/${PN} diff --git a/recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb b/recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb index b68a0fcb00..43ce1d0a20 100644 --- a/recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb +++ b/recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/xdctools_3_10_03" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "310" -PR = "r14" +PR = "r16" do_install() { install -d ${D}/${prefix}/dvsdk/xdctools_3_10_03 |