diff options
25 files changed, 393 insertions, 275 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index dd1188b7c5..8227afc2c0 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -16,7 +16,6 @@ EXTRA_IMAGEDEPENDS += "u-boot" # TI DVSDK stuff: # DSPLink rebuild DSPLINKDSPCFG ?= "OMAP3530SHMEM" -DSPLINKGPPOS ?= "OMAPLSP" DSPLINKPLATFORM ?= "OMAP3530" DSPLINKSOC ?= "3530" diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc index 81dae36bda..fee33a672f 100644 --- a/recipes/ti/ti-codec-engine.inc +++ b/recipes/ti/ti-codec-engine.inc @@ -1,27 +1,90 @@ DESCRIPTION = "Codec Engine for TI ARM/DSP processors" +require ti-paths.inc + # compile time dependencies -DEPENDS = "ti-xdctools-native ti-xdais-native ti-linuxutils ti-framework-components" -DEPENDS_append_dm6446 = " ti-cgt6x-native ti-dspbios-native" -DEPENDS_append_omap3 = " ti-cgt6x-native ti-dspbios-native" +DEPENDS = "ti-framework-components ti-xdais-native ti-xdctools-native ti-cgt6x-native" + +DEPENDS_append_dm6446 = " ti-dspbios-native ti-linuxutils ti-dsplink-module" +DEPENDS_append_omap3 = " ti-dspbios-native ti-linuxutils ti-dsplink-module" +DEPENDS_append_omapl138 = " ti-dspbios-native ti-linuxutils ti-dsplink-module" -BASE_SRC_URI = "http://install.source.dir.local" -SRC_URI = "${BASE_SRC_URI}/codec_engine_${PV},lite.tar.gz " +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV}.tar.gz;name=cetarball" # Set the source directory S = "${WORKDIR}/codec_engine_${PV}" +# Define Device variable +DEVICES_dm6446 ?= "DM6446" +DEVICES_omap3 ?= "OMAP3530" +DEVICES_dm355 ?= "DM355" +DEVICES_omapl137 ?= "OMAPL137" +DEVICES_omapl138 ?= "OMAPL138" + +#define PROGRAM variables +PROGRAMS ?= "APP_CLIENT DSP_SERVER" +PROGRAMS_dm355 = "APP_LOCAL" + +LINK_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module/packages" +CGT6x_DIR = "${STAGING_DIR_NATIVE}/ti-cgt6x-native" +XDCTOOLS_DIR = "${STAGING_DIR_NATIVE}/ti-xdctools-native" +CE_INSTALL_DIR = "${S}" + do_compile () { - echo "! Do not rebuild for now !" + + sed -i \ + -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \ + ${S}/examples/xdcpaths.mak + + for i in codecs extensions servers apps ; do + cd ${S}/examples/ti/sdo/ce/examples/$i + make DEVICES="${DEVICES}" \ + GPPOS="${GPPOS}" \ + PROGRAMS="${PROGRAMS}" \ + CE_INSTALL_DIR="${CE_INSTALL_DIR}" \ + XDC_INSTALL_DIR="${XDCTOOLS_DIR}" \ + BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\ + DSPLINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ + XDAIS_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \ + FC_INSTALL_DIR="${FC_INSTALL_DIR}" \ + CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ + LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \ + EDMA3_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \ + CGTOOLS_V5T="${CROSS_DIR}"\ + CGTOOLS_C64P="${CGT6x_DIR}" \ + CGTOOLS_C674="${CGT6x_DIR}" \ + clean all + done } +do_install() { + install -d ${D}/${installdir}/codec-engine-apps + cp ${S}/examples/apps/system_files/${DEVICES}/loadmodules.sh ${D}/${installdir}/codec-engine-apps + sed -i 's/insmod/modprobe/g' ${D}/${installdir}/codec-engine-apps/loadmodules.sh + + cd ${S}/examples/ti/sdo/ce/examples + + for i in $(find . -name "*.xv5T"); do + install -d ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /` + install ${i} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /` + + for j in $(find . -name "*.${DSPSUFFIX}"); do + install ${j} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /` + done + + done +} + + # stage tree - other packages may need this do_stage() { install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN} - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ + cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ } PACKAGE_ARCH = "${MACHINE_ARCH}" - - INHIBIT_PACKAGE_STRIP = "1" +PACKAGES += "ti-codec-engine-apps" +FILES_ti-codec-engine-apps = "${installdir}/codec-engine-apps/*" +INSANE_SKIP_ti-codec-engine-apps = True + diff --git a/recipes/ti/ti-codec-engine_2.24.01.bb b/recipes/ti/ti-codec-engine_2.24.01.bb index ae0197e3d2..03385ede83 100644 --- a/recipes/ti/ti-codec-engine_2.24.01.bb +++ b/recipes/ti/ti-codec-engine_2.24.01.bb @@ -1,12 +1,4 @@ -DESCRIPTION = "Codec Engine 2.24.01 for TI ARM/DSP processors" - -require ti-paths.inc - -# compile time dependencies -DEPENDS = "ti-framework-components ti-xdais-native ti-xdctools-native ti-cgt6x-native" - -DEPENDS_append_dm6446 = " ti-dspbios-native ti-linuxutils ti-dsplink-module" -DEPENDS_append_omap3 = " ti-dspbios-native ti-linuxutils ti-dsplink-module" +require ti-codec-engine.inc # tconf from xdctools dislikes '.' in pwd :/ PR = "r7" @@ -17,74 +9,4 @@ SRC_URI = "http://install.source.dir.local/codec_engine_2_24_01.tar.gz " # Set the source directory S = "${WORKDIR}/codec_engine_2_24_01" -# Define Device variable -DEVICES_dm6446 ?= "DM6446" -DEVICES_omap3 ?= "OMAP3530" -DEVICES_dm355 ?= "DM355" - -#define PROGRAM variables -PROGRAMS ?= "APP_CLIENT DSP_SERVER" -PROGRAMS_dm355 = "APP_LOCAL" - -LINK_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dsplink-module/packages" -CGT6x_DIR = "${STAGING_DIR_NATIVE}/ti-cgt6x-native" -XDCTOOLS_DIR = "${STAGING_DIR_NATIVE}/ti-xdctools-native" -CE_INSTALL_DIR = "${S}" - -do_compile () { - - sed -i \ - -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g \ - ${S}/examples/xdcpaths.mak - - for i in codecs extensions servers apps ; do - cd ${S}/examples/ti/sdo/ce/examples/$i - make DEVICES="${DEVICES}" \ - GPPOS="${GPPOS}" \ - PROGRAMS="${PROGRAMS}" \ - CE_INSTALL_DIR="${CE_INSTALL_DIR}" \ - XDC_INSTALL_DIR="${XDCTOOLS_DIR}" \ - BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\ - DSPLINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ - XDAIS_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \ - FC_INSTALL_DIR="${FC_INSTALL_DIR}" \ - CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ - LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \ - EDMA3_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \ - CGTOOLS_V5T="${CROSS_DIR}"\ - CGTOOLS_C64P="${CGT6x_DIR}" \ - clean all - done -} - -do_install() { - install -d ${D}/${installdir}/codec-engine-apps - cp ${S}/examples/apps/system_files/${DEVICES}/loadmodules.sh ${D}/${installdir}/codec-engine-apps - sed -i 's/insmod/modprobe/g' ${D}/${installdir}/codec-engine-apps/loadmodules.sh - - cd ${S}/examples/ti/sdo/ce/examples - - for i in $(find . -name "*.xv5T"); do - install -d ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /` - install ${i} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /` - - for j in $(find . -name "*.x64P"); do - install ${j} ${D}/${installdir}/codec-engine-apps/`dirname ${i} | cut -f3 -d /` - done - - done -} - - -# stage tree - other packages may need this -do_stage() { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN} - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -INHIBIT_PACKAGE_STRIP = "1" -PACKAGES += "ti-codec-engine-apps" -FILES_ti-codec-engine-apps = "${installdir}/codec-engine-apps/*" -INSANE_SKIP_ti-codec-engine-apps = True diff --git a/recipes/ti/ti-codec-engine_2.25.00.05.bb b/recipes/ti/ti-codec-engine_2.25.00.05.bb new file mode 100644 index 0000000000..9421aab614 --- /dev/null +++ b/recipes/ti/ti-codec-engine_2.25.00.05.bb @@ -0,0 +1,15 @@ +require ti-codec-engine.inc + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_omapl138 = "1" + + +# tconf from xdctools dislikes '.' in pwd :/ +PV = "2_25_00_05" + +SRC_URI[cetarball.md5sum] = "729ede0fd24210d3c5439511fa859d51" +SRC_URI[cetarball.sha256sum] = "81f815159f3dfda0525be6da543644b02c3610bcb080df170cbd27e2d8420ba2" + +do_install_prepend() { + ln -sf ${S}/examples/apps/system_files/OMAPL137 ${S}/examples/apps/system_files/OMAPL138 || true +} diff --git a/recipes/ti/ti-codec-engine_2.25.01.bb b/recipes/ti/ti-codec-engine_2.25.01.bb index 5a5c7d3d44..a565ac9aec 100644 --- a/recipes/ti/ti-codec-engine_2.25.01.bb +++ b/recipes/ti/ti-codec-engine_2.25.01.bb @@ -5,3 +5,7 @@ DEFAULT_PREFERENCE = "-1" PV = "2_25_00_01" PR = "r20" +do_compile () { + echo "! Do not rebuild for now !" +} + diff --git a/recipes/ti/ti-codecs-omapl137_1.0.bb b/recipes/ti/ti-codecs-omapl137_1.0.bb index 269f9a3e00..1cb87cd248 100644 --- a/recipes/ti/ti-codecs-omapl137_1.0.bb +++ b/recipes/ti/ti-codecs-omapl137_1.0.bb @@ -16,7 +16,7 @@ do_compile() { do_install () { install -d ${D}/${installdir}/codec-combo cd ${S} - for file in `find . -name *.x64P`; do + for file in `find . -name *.${DSPSUFFIX}`; do cp ${file} ${D}/${installdir}/codec-combo done } diff --git a/recipes/ti/ti-dmai.inc b/recipes/ti/ti-dmai.inc index c52e46aaf1..17325865fa 100644 --- a/recipes/ti/ti-dmai.inc +++ b/recipes/ti/ti-dmai.inc @@ -2,8 +2,10 @@ DESCRIPTION = "DMAI for TI ARM/DSP processors" BRANCH = "BRANCH_BRIJESH_DMAI_DEV_2_xx" BRANCH_6467 = "GITPSP_INT_101009" +BRANCH_omapl137 = "BRANCH_KATIE_111309_OMAPL137" SRCREV = "364" +SRCREV_omapl137 = "382" SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=${BRANCH};proto=https;user=anonymous;pswd='' \ file://loadmodules-ti-dmai-dm355_al.sh \ @@ -15,6 +17,7 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=${BRANCH};proto=https;us S = "${WORKDIR}/${BRANCH}/davinci_multimedia_application_interface" # Yes, the xdc stuff still breaks with a '.' in PWD -PV = "svnr${SRCREV}" +PE = "1" +PV = "1.0+svnr${SRCPV}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/ti/ti-dmai_svn.bb b/recipes/ti/ti-dmai_svn.bb index 1fa03e22fa..990f96784e 100644 --- a/recipes/ti/ti-dmai_svn.bb +++ b/recipes/ti/ti-dmai_svn.bb @@ -66,7 +66,8 @@ do_compile () { LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ LPM_INSTALL_DIR="${CE_INSTALL_DIR}/cetools" \ - PLATFORM="${TARGET}" + MVTOOL_PREFIX="${TARGET_PREFIX}" \ + PLATFORM="${TARGET}" } do_install () { diff --git a/recipes/ti/ti-dspbios-native.inc b/recipes/ti/ti-dspbios-native.inc new file mode 100644 index 0000000000..d9969f25d5 --- /dev/null +++ b/recipes/ti/ti-dspbios-native.inc @@ -0,0 +1,18 @@ +require ti-paths.inc +require ti-dspbios.inc +inherit native + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/dspbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=biosbin" + +BINFILE="bios_setuplinux_${PV}.bin" + +S = "${WORKDIR}/bios_${PV}" + +do_stage() { + install -d ${BIOS_INSTALL_DIR} + cp -pPrf ${S}/* ${BIOS_INSTALL_DIR} + chmod 755 -R ${BIOS_INSTALL_DIR}/* +} + +AUTOTOOLS_NATIVE_STAGE_INSTALL="1" + diff --git a/recipes/ti/ti-dspbios-native_5.33.02.bb b/recipes/ti/ti-dspbios-native_5.33.02.bb index e1cf5fbee6..4143c875da 100644 --- a/recipes/ti/ti-dspbios-native_5.33.02.bb +++ b/recipes/ti/ti-dspbios-native_5.33.02.bb @@ -9,7 +9,7 @@ BINFILE="bios_setuplinux_5_33_02.bin" S = "${WORKDIR}/bios_5_33_02" # Yes, the xdc stuff still breaks with a '.' in PWD -PV = "5332" +PV = "5_33_02" PR = "r14" do_stage() { diff --git a/recipes/ti/ti-dspbios-native_5.33.04.bb b/recipes/ti/ti-dspbios-native_5.33.04.bb index 430260fb9a..6924e93fbe 100644 --- a/recipes/ti/ti-dspbios-native_5.33.04.bb +++ b/recipes/ti/ti-dspbios-native_5.33.04.bb @@ -1,22 +1,9 @@ -require ti-dspbios.inc -inherit native +require ti-dspbios-native.inc -# download bios_setuplinux_5_33_04.bin from https://www-a.ti.com/downloads/sds_support/targetcontent/bios/bios_5_33/bios_5_33_04/index_external.html and copy in Arago (or OE) installation directory - -SRC_URI = "http://install.source.dir.local/bios_setuplinux_5_33_04.bin" -BINFILE="bios_setuplinux_5_33_04.bin" - -S = "${WORKDIR}/bios_5_33_04" +SRC_URI[biosbin.md5sum] = "fcffe1618f20024fd6580f47cdc0059b" +SRC_URI[biosbin.sha256sum] = "2c1e7feec569a19d3093b136da6aa03574f94052810fe7a78cc81eb37adda24b" # Yes, the xdc stuff still breaks with a '.' in PWD -PV = "5334" +PV = "5_33_04" PR = "r2" -do_stage() { - install -d ${STAGING_DIR_NATIVE}/${PN} - cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ - chmod 755 -R ${STAGING_DIR_NATIVE}/${PN}/* -} - -AUTOTOOLS_NATIVE_STAGE_INSTALL="1" - diff --git a/recipes/ti/ti-dspbios-native_5.33.06.bb b/recipes/ti/ti-dspbios-native_5.33.06.bb new file mode 100644 index 0000000000..e127681fed --- /dev/null +++ b/recipes/ti/ti-dspbios-native_5.33.06.bb @@ -0,0 +1,9 @@ +require ti-dspbios-native.inc + +DEFAULT_PREFERENCE = "-1" + +PV = "5_33_06" + +SRC_URI[biosbin.md5sum] = "757b35272a894864e463086565056cd7" +SRC_URI[biosbin.sha256sum] = "52136fce50becd7ae711eebe8943f8a62d06d18f03f374aad8129a6e3dc7e887" + diff --git a/recipes/ti/ti-dspbios-native_5.41.02.14.bb b/recipes/ti/ti-dspbios-native_5.41.02.14.bb new file mode 100644 index 0000000000..2d07807ade --- /dev/null +++ b/recipes/ti/ti-dspbios-native_5.41.02.14.bb @@ -0,0 +1,9 @@ +require ti-dspbios-native.inc + +DEFAULT_FREFERENCE_omapl138 = "2" + +PV = "5_41_02_14" + +SRC_URI[biosbin.md5sum] = "2a0c4ea4cc57801f666a2664e0510af9" +SRC_URI[biosbin.sha256sum] = "314c79d2b45e5e839b0c1d5a71184756f86658b33fe838c907d960fe2bf49b9b" + diff --git a/recipes/ti/ti-dspbios.inc b/recipes/ti/ti-dspbios.inc index 08d797a6e3..87b2cb5636 100644 --- a/recipes/ti/ti-dspbios.inc +++ b/recipes/ti/ti-dspbios.inc @@ -4,3 +4,5 @@ TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" require ti-eula-unpack.inc +PE = "1" + diff --git a/recipes/ti/ti-dsplink-module.inc b/recipes/ti/ti-dsplink-module.inc new file mode 100644 index 0000000000..dda4e4a9e3 --- /dev/null +++ b/recipes/ti/ti-dsplink-module.inc @@ -0,0 +1,162 @@ +DESCRIPTION = "DSPLINK module for TI ARM/DSP processors" + +require ti-paths.inc +inherit module + +# compile and run time dependencies +DEPENDS += "virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update-modules ti-xdctools-native" + +SRC_URI = "http://install.source.dir.local/dsplink_${PV}.tar.gz \ + file://loadmodules-ti-dsplink-apps.sh \ + file://unloadmodules-ti-dsplink-apps.sh" + +# Set the source directory +S = "${WORKDIR}/dsplink_${PV}" + +# DSPLINK - Config Variable for different platform +DSPLINKPLATFORM_dm6446 = "DAVINCI" +DSPLINKPLATFORM_omapl137 = "OMAPL1XX" +DSPLINKPLATFORM_omapl138 = "OMAPL138" +DSPLINKPLATFORM ?= "DAVINCI" + + +DSPLINKDSPCFG_dm6446 = "DM6446GEMSHMEM" +DSPLINKDSPCFG_omapl137 = "OMAPL1XXGEMSHMEM" +DSPLINKDSPCFG_omapl138 = "OMAPL138GEMSHMEM" +DSPLINKDSPCFG ?= "DM6446GEMSHMEM" + + +DSPLINKGPPOS_dm6446 = "MVL5G" +DSPLINKGPPOS_omapl137 = "ARM" +DSPLINKGPPOS_omapl138 = "ARM" +DSPLINKGPPOS_omap3 = "OMAPLSP" +DSPLINKGPPOS ?= "ARM" + +DSPLINK = "${S}/dsplink" +export DSPLINK + +STAGING_TI_DSPBIOS_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native" +STAGING_TI_CGT6x_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native" +STAGING_TI_XDCTOOL_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native" + +do_configure() { + + # asm/page.h is gone with linux-libc-headers 2.6.31. + # We can safely sed it out since it has been empty for the past 2 years + sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c || true + + # Run perl script to create appropriate makefiles (v1.60 and up) + ( + cd ${DSPLINK} + perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 \ + --dspcfg_0=${DSPLINKDSPCFG} --dspos_0=DSPBIOS5XX \ + --gppos=${DSPLINKGPPOS} --comps=ponslrmc + + for i in ${DSPLINK}/gpp ${DSPLINK}/dsp ; do + cd $i + ${XDC_INSTALL_DIR}/xdc clean + ${XDC_INSTALL_DIR}/xdc .interfaces + done + ) + +} + +do_compile() { + # TODO :: KERNEL_CC, etc need replacing with user CC + # TODO :: Need to understand why OBJDUMP is required for kernel module + # Unset these since LDFLAGS gets picked up and used incorrectly.... need + # investigation + + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + + # Build the gpp user space library + cd ${DSPLINK}/gpp/src/api && make \ + CROSS_COMPILE="${TARGET_PREFIX}" \ + CC="${KERNEL_CC}" \ + AR="${KERNEL_AR}" \ + LD="${KERNEL_LD}" \ + COMPILER="${KERNEL_CC}" \ + ARCHIVER="${KERNEL_AR}" \ + KERNEL_DIR="${STAGING_KERNEL_DIR}" \ + all + + # Build the gpp kernel space (debug and release) + cd ${DSPLINK}/gpp/src && make \ + OBJDUMP="${TARGET_PREFIX}objdump" \ + CROSS_COMPILE="${TARGET_PREFIX}" \ + CC="${KERNEL_CC}" \ + AR="${KERNEL_AR}" \ + LD="${KERNEL_LD}" \ + COMPILER="${KERNEL_CC}" \ + ARCHIVER="${KERNEL_AR}" \ + KERNEL_DIR="${STAGING_KERNEL_DIR}" \ + BASE_BUILDOS="${STAGING_KERNEL_DIR}" \ + all + + # Build the gpp samples + cd ${DSPLINK}/gpp/src/samples + cd ${DSPLINK}/gpp/src/samples && make \ + BASE_TOOLCHAIN="${CROSS_DIR}" \ + BASE_CGTOOLS="${BASE_TOOLCHAIN}/bin" \ + OSINC_PLATFORM="${CROSS_DIR}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include" \ + OSINC_TARGET="${BASE_TOOLCHAIN}/target/usr/include" \ + CROSS_COMPILE="${TARGET_PREFIX}" \ + CC="${KERNEL_CC}" \ + AR="${KERNEL_AR}" \ + LD="${KERNEL_LD}" \ + COMPILER="${KERNEL_CC}" \ + LINKER="${KERNEL_CC}" \ + ARCHIVER="${KERNEL_AR}" \ + KERNEL_DIR="${STAGING_KERNEL_DIR}" \ + clean all + + # Build the dsp library (debug and release) + cd ${DSPLINK}/dsp/src && make \ + BASE_CGTOOLS="${STAGING_TI_CGT6x_DIR}" \ + BASE_SABIOS="${STAGING_TI_DSPBIOS_DIR}" \ + clean all + + # Build the dsp samples (debug and release) + cd ${DSPLINK}/dsp/src/samples && make \ + BASE_CGTOOLS="${STAGING_TI_CGT6x_DIR}" \ + BASE_SABIOS="${STAGING_TI_DSPBIOS_DIR}" \ + clean all +} + +do_install () { + # DSPLINK driver - kernel module + install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp + install -m 0755 ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/ + + # DSPLINK library + install -d ${D}/${installdir}/dsplink/libs + install -m 0755 ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/dsplink.lib ${D}/${installdir}/dsplink/libs + + # DSPLINK sample apps + install -d ${D}/${installdir}/dsplink/apps + + cp ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/*gpp ${D}/${installdir}/dsplink/apps + + for i in $(find ${DSPLINK}/dsp/BUILD/ -name "*.out") ; do + cp ${i} ${D}/${installdir}/dsplink/apps + done + + # DSPLINK test app module un/load scripts + install ${WORKDIR}/loadmodules-ti-dsplink-apps.sh ${D}/${installdir}/dsplink/apps + install ${WORKDIR}/unloadmodules-ti-dsplink-apps.sh ${D}/${installdir}/dsplink/apps +} + +do_stage () { + install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages + cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages +} + +INHIBIT_PACKAGE_STRIP = "1" + +PACKAGES += " ti-dsplink-apps" +FILES_ti-dsplink-apps = "${installdir}/dsplink/*" + +# Disable QA check untils we figure out how to pass LDFLAGS in build +INSANE_SKIP_${PN} = True +INSANE_SKIP_ti-dsplink-apps = True + diff --git a/recipes/ti/ti-dsplink-module_1.61.3.bb b/recipes/ti/ti-dsplink-module_1.61.3.bb index 41fd212a0d..8da781036f 100644 --- a/recipes/ti/ti-dsplink-module_1.61.3.bb +++ b/recipes/ti/ti-dsplink-module_1.61.3.bb @@ -1,10 +1,4 @@ -DESCRIPTION = "DSPLINK 1.61.3 module for TI ARM/DSP processors" - -require ti-paths.inc -inherit module - -# compile and run time dependencies -DEPENDS += "virtual/kernel perl-native ti-dspbios-native ti-cgt6x-native update-modules ti-xdctools-native" +require ti-dsplink-module.inc #This is a kernel module, don't set PR directly MACHINE_KERNEL_PR_append = "b" @@ -12,149 +6,8 @@ MACHINE_KERNEL_PR_append = "b" # tconf from xdctools dislikes '.' in pwd :/ PV = "1_61_03" -SRC_URI = "http://install.source.dir.local/dsplink_1_61_03.tar.gz \ - file://loadmodules-ti-dsplink-apps.sh \ - file://unloadmodules-ti-dsplink-apps.sh" - -# Set the source directory -S = "${WORKDIR}/dsplink_1_61_03" - -# DSPLINK - Config Variable for different platform -DSPLINKPLATFORM ?= "DAVINCI" -DSPLINKPLATFORM_dm6446 ?= "DAVINCI" -DSPLINKPLATFORM_omapl137 ?= "OMAPL1XX" - -DSPLINKDSPCFG ?= "DM6446GEMSHMEM" -DSPLINKDSPCFG_dm6446 ?= "DM6446GEMSHMEM" -DSPLINKDSPCFG_omapl137 ?= "OMAPL1XXGEMSHMEM" - -DSPLINKGPPOS ?= "MVL5G" -DSPLINKGPPOS_dm6446 ?= "MVL5G" -DSPLINKGPPOS_omapl137 ?= "MVL5G" - -DSPLINK = "${S}/dsplink" -export DSPLINK - -STAGING_TI_DSPBIOS_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native" -STAGING_TI_CGT6x_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native" -STAGING_TI_XDCTOOL_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native" - -do_compile() { - - # asm/page.h is gone with linux-libc-headers 2.6.31. - # We can safely sed it out since it has been empty for the past 2 years - sed -i /page.h/d ${S}/dsplink/gpp/src/api/Linux/drv_api.c - - # Run perl script to create appropriate makefiles (v1.60 and up) - ( - cd ${DSPLINK} - perl config/bin/dsplinkcfg.pl --platform=${DSPLINKPLATFORM} --nodsp=1 \ - --dspcfg_0=${DSPLINKDSPCFG} --dspos_0=DSPBIOS5XX \ - --gppos=${DSPLINKGPPOS} --comps=ponslrm - ) - - # dsplink makefile is hard-coded to use kbuild only on OMAP3530. +do_configure_append() { + # dsplink makefile is hard-coded to use kbuild only on OMAP3530. # we are forcing to use kbuild on other platforms. - sed -i 's/OMAP3530/${DSPLINKPLATFORM}/g' ${DSPLINK}/gpp/src/Makefile - - # TODO :: KERNEL_CC, etc need replacing with user CC - # TODO :: Need to understand why OBJDUMP is required for kernel module - # Unset these since LDFLAGS gets picked up and used incorrectly.... need - # investigation - - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - - # Build the gpp user space library - cd ${DSPLINK}/gpp/src/api - make \ - CROSS_COMPILE="${TARGET_PREFIX}" \ - CC="${KERNEL_CC}" \ - AR="${KERNEL_AR}" \ - LD="${KERNEL_LD}" \ - COMPILER="${KERNEL_CC}" \ - ARCHIVER="${KERNEL_AR}" \ - KERNEL_DIR="${STAGING_KERNEL_DIR}" \ - clean all - - # Build the gpp kernel space (debug and release) - cd ${DSPLINK}/gpp/src - make \ - OBJDUMP="${TARGET_PREFIX}objdump" \ - CROSS_COMPILE="${TARGET_PREFIX}" \ - CC="${KERNEL_CC}" \ - AR="${KERNEL_AR}" \ - LD="${KERNEL_LD}" \ - COMPILER="${KERNEL_CC}" \ - ARCHIVER="${KERNEL_AR}" \ - KERNEL_DIR="${STAGING_KERNEL_DIR}" \ - clean all - - # Build the gpp samples - cd ${DSPLINK}/gpp/src/samples - make \ - BASE_TOOLCHAIN="${CROSS_DIR}" \ - BASE_CGTOOLS="${BASE_TOOLCHAIN}/bin" \ - OSINC_PLATFORM="${CROSS_DIR}/lib/gcc/${TARGET_SYS}/$(${TARGET_PREFIX}gcc -dumpversion)/include" \ - OSINC_TARGET="${BASE_TOOLCHAIN}/target/usr/include" \ - CROSS_COMPILE="${TARGET_PREFIX}" \ - CC="${KERNEL_CC}" \ - AR="${KERNEL_AR}" \ - LD="${KERNEL_LD}" \ - COMPILER="${KERNEL_CC}" \ - LINKER="${KERNEL_CC}" \ - ARCHIVER="${KERNEL_AR}" \ - KERNEL_DIR="${STAGING_KERNEL_DIR}" \ - clean all - - # Build the dsp library (debug and release) - cd ${DSPLINK}/dsp/src - make \ - BASE_CGTOOLS="${STAGING_TI_CGT6x_DIR}" \ - BASE_SABIOS="${STAGING_TI_DSPBIOS_DIR}" \ - clean all - - # Build the dsp samples (debug and release) - cd ${DSPLINK}/dsp/src/samples - make \ - BASE_CGTOOLS="${STAGING_TI_CGT6x_DIR}" \ - BASE_SABIOS="${STAGING_TI_DSPBIOS_DIR}" \ - clean all -} - -do_install () { - # DSPLINK driver - kernel module - install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp - install -m 0755 ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/ - - # DSPLINK library - install -d ${D}/${installdir}/dsplink/libs - install -m 0755 ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/dsplink.lib ${D}/${installdir}/dsplink/libs - - # DSPLINK sample apps - install -d ${D}/${installdir}/dsplink/apps - - cp ${DSPLINK}/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/RELEASE/*gpp ${D}/${installdir}/dsplink/apps - - for i in $(find ${DSPLINK}/dsp/BUILD/ -name "*.out") ; do - cp ${i} ${D}/${installdir}/dsplink/apps - done - - # DSPLINK test app module un/load scripts - install ${WORKDIR}/loadmodules-ti-dsplink-apps.sh ${D}/${installdir}/dsplink/apps - install ${WORKDIR}/unloadmodules-ti-dsplink-apps.sh ${D}/${installdir}/dsplink/apps -} - -do_stage () { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/packages + sed -i 's/OMAP3530/${DSPLINKPLATFORM}/g' ${DSPLINK}/gpp/src/Makefile } - -INHIBIT_PACKAGE_STRIP = "1" - -PACKAGES += " ti-dsplink-apps" -FILES_ti-dsplink-apps = "${installdir}/dsplink/*" - -# Disable QA check untils we figure out how to pass LDFLAGS in build -INSANE_SKIP_${PN} = True -INSANE_SKIP_ti-dsplink-apps = True - diff --git a/recipes/ti/ti-dsplink-module_1.64.bb b/recipes/ti/ti-dsplink-module_1.64.bb new file mode 100644 index 0000000000..2b77530e7e --- /dev/null +++ b/recipes/ti/ti-dsplink-module_1.64.bb @@ -0,0 +1,22 @@ +require ti-dsplink-module.inc + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/DSPLink/${PV}/exports/dsplink_linux_${PV}.tar.gz;name=dsplinktarball \ + file://loadmodules-ti-dsplink-apps.sh \ + file://unloadmodules-ti-dsplink-apps.sh" + +SRC_URI[dsplinktarball.md5sum] = "90223da7c88af57d12936adeba1a0661" +SRC_URI[dsplinktarball.sha256sum] = "32b6fbae2b61f5f71ab3eae9d2f5ad6b75d682ad8bde9963152830be1f8d286b" + +# tconf from xdctools dislikes '.' in pwd :/ +PV = "1_64" +S = "${WORKDIR}/dsplink_linux_${PV}" + +# Cheat a bit with includes +# SZ_1k = 0x00000400 +# /OE/angstrom-dev/work/beagleboard-angstrom-linux-gnueabi/ti-dsplink-module-1_64-r50/dsplink_linux_1_64/dsplink/gpp/src/../../gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c:127: error: 'SZ_2K' undeclared (first use in this function) + +do_compile_prepend() { + sed -i s:SZ_2K:0x00000800:g ${S}/dsplink/gpp/src/arch/OMAP3530/shmem/Linux/omap3530_phy_shmem.c +} + + diff --git a/recipes/ti/ti-multimedia-common.inc b/recipes/ti/ti-multimedia-common.inc index 170e77bfec..b08838de18 100644 --- a/recipes/ti/ti-multimedia-common.inc +++ b/recipes/ti/ti-multimedia-common.inc @@ -35,8 +35,8 @@ XDC_PLATFORM_dm355 = ti.platforms.evmDM355 XDC_PLATFORM_dm365 = ti.platforms.evmDM365 XDC_PLATFORM_dm6446 = ti.platforms.evmDM6446 XDC_PLATFORM_omap3 = ti.platforms.evm3530 -XDC_PLATFORM_omapl137 = ti.platforms.omapl137 -XDC_PLATFORM_omapl138 = ti.platforms.omapl138 +XDC_PLATFORM_omapl137 = ti.platforms.evmOMAPL137 +XDC_PLATFORM_omapl138 = ti.platforms.evmOMAPL138 export XDC_PLATFORM export PLATFORM_XDC = ${XDC_PLATFORM} @@ -45,6 +45,10 @@ LPMDSPPOWERSOC_omap3 = "omap3530" export LPMDSPPOWERSOC +DSPSUFFIX_omapl137 = "x674" +DSPSUFFIX_omapl138 = "x674" +DSPSUFFIX ?= "x64P" + PLATFORM_dm355 = "dm355" PLATFORM_dm365 = "dm365" PLATFORM_dm6446 = "dm6446" diff --git a/recipes/ti/ti-xdais-native_6.25.00.07.bb b/recipes/ti/ti-xdais-native_6.25.00.07.bb new file mode 100644 index 0000000000..8733e2c125 --- /dev/null +++ b/recipes/ti/ti-xdais-native_6.25.00.07.bb @@ -0,0 +1,16 @@ +require ti-xdais.inc + +SRC_URI[xdaisgz.md5sum] = "ef10494d9f7dfc768edd5b7124d7f93d" +SRC_URI[xdaisgz.sha256sum] = "1f7ad591c742616f087690f7cbdbb0b69e61091050a1f59a152e34dd865e1e23" + +PV = "6_25_00_07" + +inherit native + +do_stage() { + install -d ${STAGING_DIR_NATIVE}/ti-xdais + cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/ti-xdais +} + +AUTOTOOLS_NATIVE_STAGE_INSTALL="1" + diff --git a/recipes/ti/ti-xdais.inc b/recipes/ti/ti-xdais.inc index 4816ee288a..e200c895ac 100644 --- a/recipes/ti/ti-xdais.inc +++ b/recipes/ti/ti-xdais.inc @@ -1,9 +1,11 @@ DESCRIPTION = "TI DSP Algorithm Interface Standard specification" +# Have a look at http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/index.html + PVEXTENSION ?= "" BASE_SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports" -SRC_URI = "${BASE_SRC_URI}/xdais_${PV}${PVEXTENSION}.tar.gz" +SRC_URI = "${BASE_SRC_URI}/xdais_${PV}${PVEXTENSION}.tar.gz;name=xdaisgz" S = "${WORKDIR}/xdais_${PV}${PVEXTENSION}" diff --git a/recipes/ti/ti-xdctools-native.inc b/recipes/ti/ti-xdctools-native.inc new file mode 100644 index 0000000000..af6c9d7fc2 --- /dev/null +++ b/recipes/ti/ti-xdctools-native.inc @@ -0,0 +1,15 @@ +inherit native + +require ti-xdctools.inc + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdctools_setuplinux_${PV}.bin;name=xdcbin" + +do_stage() { + install -d ${XDC_INSTALL_DIR} + cp -pPrf ${S}/* ${XDC_INSTALL_DIR} + chmod 755 -R ${XDC_INSTALL_DIR} + chmod 755 -R ${S} +} + +AUTOTOOLS_NATIVE_STAGE_INSTALL="1" + diff --git a/recipes/ti/ti-xdctools-native_3.15.01.59.bb b/recipes/ti/ti-xdctools-native_3.15.01.59.bb index ee34a5eec2..cc263f77d6 100644 --- a/recipes/ti/ti-xdctools-native_3.15.01.59.bb +++ b/recipes/ti/ti-xdctools-native_3.15.01.59.bb @@ -1,16 +1,7 @@ -inherit native - BASE_PV = "3_15" PV = "3_15_01_59" -require ti-xdctools.inc - -do_stage() { - install -d ${STAGING_DIR_NATIVE}/${PN} - cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN} - chmod 755 -R ${STAGING_DIR_NATIVE}/${PN} - chmod 755 -R ${S} -} +require ti-xdctools-native.inc +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_${BASE_PV}/exports/xdctools_setuplinux_${PV}.bin" -AUTOTOOLS_NATIVE_STAGE_INSTALL="1" diff --git a/recipes/ti/ti-xdctools-native_3.15.04.70.bb b/recipes/ti/ti-xdctools-native_3.15.04.70.bb new file mode 100644 index 0000000000..832cf9f6a7 --- /dev/null +++ b/recipes/ti/ti-xdctools-native_3.15.04.70.bb @@ -0,0 +1,11 @@ +DEFAULT_PREFERENCE = "-1" + +BASE_PV = "3_15" +PV = "3_15_04_70" + +require ti-xdctools-native.inc + +SRC_URI[xdcbin.md5sum] = "855a3b41d703a5c4e707d6ba9a23f94d" +SRC_URI[xdcbin.sha256sum] = "e4eb68e62fc2774c1a4d0b19e4375e83cf39d249901647c86100930f511550a5" + + diff --git a/recipes/ti/ti-xdctools-native_3.16.01.27.bb b/recipes/ti/ti-xdctools-native_3.16.01.27.bb new file mode 100644 index 0000000000..0d220e25e6 --- /dev/null +++ b/recipes/ti/ti-xdctools-native_3.16.01.27.bb @@ -0,0 +1,9 @@ +BASE_PV = "3_16" +PV = "3_16_01_27" + +require ti-xdctools-native.inc + +SRC_URI[xdcbin.md5sum] = "10d5ef7490cda01978205175cb43a618" +SRC_URI[xdcbin.sha256sum] = "48f460eb64c092ff3f72b290457d69cd46a538e0a9086989584f1f0d2da32d54" + + diff --git a/recipes/ti/ti-xdctools.inc b/recipes/ti/ti-xdctools.inc index 5d29436042..10738ab08e 100644 --- a/recipes/ti/ti-xdctools.inc +++ b/recipes/ti/ti-xdctools.inc @@ -7,6 +7,7 @@ S = "${WORKDIR}/xdctools_${PV}" TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" +require ti-paths.inc require ti-eula-unpack.inc |