[meta-ti] [PATCH] ti-ipc-rtos: Update to include examples and documentation with the package
Denys Dmytriyenko
denys at ti.com
Fri May 13 11:56:52 PDT 2016
Sam,
Is this v2? You didn't specify changes since v1, so I would have to dig out
the previous submission and check that past comments were addressed.
Jake,
Do you have any comments here?
On Wed, May 11, 2016 at 02:00:39PM -0400, Sam Nelson wrote:
> Updated to new version 3.42.01.03
> Added procedures and source urls for adding examples and documentation
> into src package.
> Added dependency on doxygen for document creation
> Added big endian c66 targets
> Updated uniform formatting
>
> Signed-off-by: Sam Nelson <sam.nelson at ti.com>
> ---
> recipes-ti/ipc/ti-ipc-rtos_git.bb | 119 ++++++++++++++++++++++++++++++++------
> recipes-ti/ipc/ti-ipc.inc | 6 +-
> 2 files changed, 104 insertions(+), 21 deletions(-)
>
> diff --git a/recipes-ti/ipc/ti-ipc-rtos_git.bb b/recipes-ti/ipc/ti-ipc-rtos_git.bb
> index 4c0fc74..8fb448f 100644
> --- a/recipes-ti/ipc/ti-ipc-rtos_git.bb
> +++ b/recipes-ti/ipc/ti-ipc-rtos_git.bb
> @@ -2,9 +2,44 @@ require recipes-ti/includes/ti-paths.inc
> require recipes-ti/includes/ti-staging.inc
> require ti-ipc.inc
>
> -PR = "${INC_PR}.4"
> +TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/ipc/ipc-examples.git"
> +TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples"
> +TI_IPC_EXAMPLES_GIT_PROTOCOL = "git"
> +TI_IPC_EXAMPLES_GIT_BRANCH = "master"
> +TI_IPC_EXAMPLES_NAME = "ipc-examples"
>
> -DEPENDS = "ti-xdctools ti-sysbios"
> +SRC_URI += "${TI_IPC_EXAMPLES_GIT_URI};\
> +destsuffix=${TI_IPC_EXAMPLES_DEST_SUFFIX};\
> +protocol=${TI_IPC_EXAMPLES_GIT_PROTOCOL};\
> +branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\
> +name=${TI_IPC_EXAMPLES_NAME}"
> +
> +TI_IPC_METADATA_GIT_URI = "git://git.ti.com/ipc/ipc-metadata.git"
> +TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata"
> +TI_IPC_METADATA_GIT_PROTOCOL = "git"
> +TI_IPC_METADATA_GIT_BRANCH = "master"
> +TI_IPC_METADATA_NAME = "ipc-metadata"
> +
> +SRC_URI += "${TI_IPC_METADATA_GIT_URI};\
> +destsuffix=${TI_IPC_METADATA_DEST_SUFFIX};\
> +protocol=${TI_IPC_METADATA_GIT_PROTOCOL};\
> +branch=${TI_IPC_METADATA_GIT_BRANCH};\
> +name=${TI_IPC_METADATA_NAME}"
> +
> +# Corresponds to tag: 3.42.01.03
> +SRCREV_ipc-examples = "bd4f28bd46467553e6610629ff13b4b5b3ba3af0"
> +
> +# Corresponds to tag: 3.42.01.03
> +SRCREV_ipc-metadata = "4d01fe4a7c41d2ce76a62b4325e66753d59b298c"
> +
> +SRCREV_FORMAT = "ipc-metadata_ipc-examples"
> +
> +S_ipc-examples = "${WORKDIR}/git/ipc-examples"
> +S_ipc-metadata = "${WORKDIR}/git/ipc-metadata"
> +
> +PR = "${INC_PR}.0"
> +
> +DEPENDS = "ti-xdctools ti-sysbios doxygen-native"
> DEPENDS_append_keystone = " ti-cgt6x-native \
> gcc-arm-none-eabi-native \
> "
> @@ -12,6 +47,8 @@ DEPENDS_append_omap-a15 = " ti-cgt6x-native \
> ti-ccsv6-native \
> gcc-arm-none-eabi-native \
> "
> +DEPENDS_append_c66x = " ti-cgt6x-native \
> +"
>
> PACKAGES =+ "${PN}-fw"
> FILES_${PN}-fw = "${base_libdir}/firmware/*"
> @@ -26,6 +63,7 @@ IPC_TARGETS = ""
> IPC_TARGETS_omap-a15 = "\
> gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
> ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
> + ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
> ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \
> ti.targets.arm.elf.M4F="${M4_TOOLCHAIN_INSTALL_DIR}" \
> "
> @@ -33,18 +71,66 @@ IPC_TARGETS_omap-a15 = "\
> IPC_TARGETS_keystone = " \
> gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
> ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
> + ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
> +"
> +
> +IPC_TARGETS_c66x = " \
> + ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
> + ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
> "
>
> EXTRA_OEMAKE = "\
> PLATFORM=${PLATFORM} \
> XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \
> BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" \
> - ${IPC_TARGETS} -f ipc-bios.mak\
> + ${IPC_TARGETS} \
> "
>
> +RELEASE_TYPE = "GA"
> +RELEASE_SUFFIX = ""
> +
> +SRCIPK_SRC_DIR = "${D}${IPC_INSTALL_DIR_RECIPE}"
> +SRCIPK_INSTALL_DIR = "ipc_${@'${PV}'.replace('.', '_')}${RELEASE_SUFFIX}"
> +
> do_compile() {
> - oe_runmake clean
> - oe_runmake all
> + oe_runmake -f ipc-bios.mak clean
> + oe_runmake -f ipc-bios.mak release
> +
> + cd ${S_ipc-metadata}
> + oe_runmake .all-files IPC_INSTALL_DIR="${S}" \
> + BUILD_HOST_OS="linux" \
> + RELEASE_TYPE="${RELEASE_TYPE}"
> +
> + cd ${S_ipc-examples}/src
> + oe_runmake .examples \
> + IPCTOOLS="${S_ipc-metadata}/src/etc"
> +
> + if [ "${PLATFORM}" != "UNKNOWN" ]; then
> + oe_runmake extract HOSTOS="bios" IPC_INSTALL_DIR="${S}"
> + oe_runmake extract HOSTOS="linux" IPC_INSTALL_DIR="${S}"
> +
> + if [ ! -z ${ALT_PLATFORM} ]; then
> + oe_runmake extract PLATFORM=${ALT_PLATFORM} HOSTOS="bios" IPC_INSTALL_DIR="${S}"
> + oe_runmake extract PLATFORM=${ALT_PLATFORM} HOSTOS="linux" IPC_INSTALL_DIR="${S}"
> + fi
> + fi
> +
> + IPC_VERSION=`echo ${PV}${RELEASE_SUFFIX} | sed -e 's|\.|_|g'`
> + # Copy docs and other meta files
> + install -d ${D}${IPC_INSTALL_DIR_RECIPE}
> + cp -pPrf ${S_ipc-metadata}/exports/ipc_${IPC_VERSION}/* -d ${D}${IPC_INSTALL_DIR_RECIPE}
> +
> + # Copy example folders corresponding to the platforms
> + if [ "${PLATFORM}" != "UNKNOWN" ]; then
> + install -d ${D}${IPC_INSTALL_DIR_RECIPE}/examples
> + cp -pPf ${S_ipc-examples}/src/examples/*.* ${D}${IPC_INSTALL_DIR_RECIPE}/examples/
> + cp -pPf ${S_ipc-examples}/src/examples/makefile ${D}${IPC_INSTALL_DIR_RECIPE}/examples/
> + cp -pPrf ${S_ipc-examples}/src/examples/${PLATFORM}* ${D}${IPC_INSTALL_DIR_RECIPE}/examples/
> + if [ ! -z ${ALT_PLATFORM} ]; then
> + cp -pPrf ${S_ipc-examples}/src/examples/${ALT_PLATFORM}* ${D}${IPC_INSTALL_DIR_RECIPE}/examples/
> + fi
> + find ${D}${IPC_INSTALL_DIR_RECIPE}/examples/ -name "*zip" -type f | xargs -I {} rm {}
> + fi
> }
>
> do_compile_append() {
> @@ -52,25 +138,22 @@ do_compile_append() {
> }
>
> do_install() {
> - install -d ${D}${IPC_INSTALL_DIR_RECIPE}
> - cp -pPrf ${S}/* ${D}${IPC_INSTALL_DIR_RECIPE}
> -
> - install -d ${D}${base_libdir}/firmware/ipc
> - cp -pPrf ${S}/packages/ti/ipc/tests/bin/* ${D}${base_libdir}/firmware/ipc
> + install -d ${D}${base_libdir}/firmware/ipc
> + cp -pPrf ${S}/packages/ti/ipc/tests/bin/* ${D}${base_libdir}/firmware/ipc
> }
>
> ALTERNATIVE_PRIORITY = "5"
>
> pkg_postinst_${PN}-fw_omap-a15 () {
> - update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY}
> - update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY}
> - update-alternatives --install /lib/firmware/dra7-ipu1-fw.xem4 dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${ALTERNATIVE_PRIORITY}
> - update-alternatives --install /lib/firmware/dra7-ipu2-fw.xem4 dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 ${ALTERNATIVE_PRIORITY}
> + update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY}
> + update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY}
> + update-alternatives --install /lib/firmware/dra7-ipu1-fw.xem4 dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${ALTERNATIVE_PRIORITY}
> + update-alternatives --install /lib/firmware/dra7-ipu2-fw.xem4 dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 ${ALTERNATIVE_PRIORITY}
> }
>
> pkg_postrm_${PN}-fw_omap-a15 () {
> - update-alternatives --remove dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66
> - update-alternatives --remove dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66
> - update-alternatives --remove dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4
> - update-alternatives --remove dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4
> + update-alternatives --remove dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66
> + update-alternatives --remove dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66
> + update-alternatives --remove dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4
> + update-alternatives --remove dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4
> }
> diff --git a/recipes-ti/ipc/ti-ipc.inc b/recipes-ti/ipc/ti-ipc.inc
> index 69127aa..9c5dfed 100644
> --- a/recipes-ti/ipc/ti-ipc.inc
> +++ b/recipes-ti/ipc/ti-ipc.inc
> @@ -8,15 +8,15 @@ TI_IPC_GIT_URI = "git://git.ti.com/ipc/ipcdev.git"
> TI_IPC_GIT_PROTOCOL = "git"
> TI_IPC_GIT_BRANCH = "3.42"
>
> -#Corresponds to 3.42.00.02
> -TI_IPC_SRCREV = "a520969994378fb2629d7dfc25f306c3a711b5bc"
> +#Corresponds to 3.42.01.03
> +TI_IPC_SRCREV = "dc6c5082f478225b7fbce4216173e6c5b36100b4"
>
> BRANCH = "${TI_IPC_GIT_BRANCH}"
> SRC_URI = "${TI_IPC_GIT_URI};protocol=${TI_IPC_GIT_PROTOCOL};branch=${BRANCH}"
> SRCREV = "${TI_IPC_SRCREV}"
>
> S = "${WORKDIR}/git"
> -PV = "3.42.00.02"
> +PV = "3.42.01.03"
> INC_PR = "r0"
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
More information about the meta-ti
mailing list