Thanks, I'll merge it to next along with packagegroup update.
On Thu, Oct 31, 2019 at 02:53:09PM -0500, Santosh Jha wrote:
> - Fixed softlink - inherit update-alternatives
> - Added all-bios binaries in install
>
> Signed-off-by: Santosh Jha <s...@ti.com>
>
> ---
> Changes:
> - Removed 'inherit deploy'
> - Updated Commit message
> - Removed deploy appends
> - Fixed typo in commit message
> - Modified the script to use stripped image for
> symbolic link
> - removed {PN}-src, renamed allrtos to rtos
> ---
> ---
> .../ipc-lld/ipc-lld-examples-rtos_git.bb | 78 +++++++++----------
> recipes-bsp/ipc-lld/ipc-lld.inc | 2 +-
> 2 files changed, 38 insertions(+), 42 deletions(-)
>
> diff --git a/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
> b/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
> index 75db2162..6a3e233f 100644
> --- a/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
> +++ b/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb
> @@ -2,11 +2,16 @@ SUMMARY = "echo_test for IPC-LLD"
>
> require ipc-lld.inc
>
> +inherit update-alternatives
> +
> DEPENDS += " ipc-lld-rtos common-csl-ip-rtos sciclient-rtos board-rtos"
>
> -REMOTE_FW_DIR = "${S}/examples/echo_test/yocto_bin"
> +REMOTE_FW_DIR = "${S}/examples/yocto_bin"
> REMOTE_FW_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_test/bin"
> REMOTE_FWB_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_testb/bin"
> +RTOS_ALL_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin"
> +RTOS_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin"
> +LINUX_2_CORES_BIN_DIR =
> "${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin"
>
> DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc"
>
> @@ -25,13 +30,18 @@ do_compile() {
> }
>
> do_install() {
> + CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
> install -d ${D}${DST_BIN_PATH}
>
> + cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin -d
> ${D}/ex02_bios_multicore_echo_test
> + cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin -d
> ${D}/ex01_bios_2core_echo_test
> + cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin -d
> ${D}/ex03_linux_bios_2core_echo_test
> +
> for board in ${TI_PDK_LIMIT_BOARDS}
> do
> for core in ${TI_PDK_LIMIT_CORES}
> do
> - install -m 0644
> ${REMOTE_FW_BIN_DIR}/$board/ipc_echo_test_${core}_release.x*
> ${D}${DST_BIN_PATH}
> + install -m 0644
> ${REMOTE_FW_BIN_DIR}/$board/ipc_echo_test_${core}_release* ${D}${DST_BIN_PATH}
>
> #removing map files copied in previous line
> rm ${D}${DST_BIN_PATH}/*.map
> @@ -51,6 +61,13 @@ do_install_append_j7-evm() {
> install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_1_release.xer5f
> ${D}${DST_BIN_PATH}
> install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_0_release.xer5f
> ${D}${DST_BIN_PATH}
> install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release.xer5f
> ${D}${DST_BIN_PATH}
> +
> + install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release_strip.xer5f
> ${D}${DST_BIN_PATH}
> + install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release_strip.xer5f
> ${D}${DST_BIN_PATH}
> + install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_0_release_strip.xer5f
> ${D}${DST_BIN_PATH}
> + install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu2_1_release_strip.xer5f
> ${D}${DST_BIN_PATH}
> + install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_0_release_strip.xer5f
> ${D}${DST_BIN_PATH}
> + install -m 0644
> ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release_strip.xer5f
> ${D}${DST_BIN_PATH}
> }
>
>
> @@ -101,53 +118,32 @@ ALTERNATIVE_LINK_NAME[j7-c71_0-fw] =
> "${base_libdir}/firmware/${TARGET_C7X}"
>
> # Create the firmware alternatives
>
> -ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release.xer5f"
> -ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release.xer5f"
> +ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release_strip.xer5f"
> +ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f"
>
> -ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release.xer5f"
> -ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release.xer5f"
> -ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release.xer5f"
> -ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release.xer5f"
> -ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release.xer5f"
> -ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release.xer5f"
> -ALTERNATIVE_TARGET[j7-c66_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release.xe66"
> -ALTERNATIVE_TARGET[j7-c66_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release.xe66"
> -ALTERNATIVE_TARGET[j7-c71_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release.xe71"
> +ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f"
> +ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f"
> +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f"
> +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f"
> +ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f"
> +ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f"
> +ALTERNATIVE_TARGET[j7-c66_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release_strip.xe66"
> +ALTERNATIVE_TARGET[j7-c66_1-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66"
> +ALTERNATIVE_TARGET[j7-c71_0-fw] =
> "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71"
>
> ALTERNATIVE_PRIORITY = "10"
>
> -# copy the executables into the deploy directory
> -
> -do_deploy() {
> - :
> -}
> +#add source and all rtos binaries package
> +PACKAGES =+ "${PN}-rtos"
>
> -do_deploy_am65xx() {
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu1_0_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu1_1_release.xer5f
> ${DEPLOYDIR}/
> -}
> -
> -do_deploy_j7-evm() {
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu1_0_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FWB_BIN_DIR}/ipc_echo_testb_mcu1_0_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu1_1_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FWB_BIN_DIR}/ipc_echo_testb_mcu1_1_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu2_0_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FWB_BIN_DIR}/ipc_echo_testb_mcu2_0_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu2_1_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FWB_BIN_DIR}/ipc_echo_testb_mcu2_1_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu3_0_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FWB_BIN_DIR}/ipc_echo_testb_mcu3_0_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_mcu3_1_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FWB_BIN_DIR}/ipc_echo_testb_mcu3_1_release.xer5f
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_c66xdsp_1_release.xe66
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_c66xdsp_2_release.xe66
> ${DEPLOYDIR}/
> - install ${REMOTE_FW_BIN_DIR}/ipc_echo_test_c7x_1_release.xe71
> ${DEPLOYDIR}/
> -}
> # make sure that lib/firmware, and all its contents are part of the package
> FILES_${PN} += "${base_libdir}/firmware"
> -FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
> +
> +FILES_${PN}-rtos += "ex02_bios_multicore_echo_test"
> +FILES_${PN}-rtos += "ex01_bios_2core_echo_test"
> +FILES_${PN}-rtos += "ex03_linux_bios_2core_echo_test"
>
> INSANE_SKIP_${PN} = "arch ldflags file-rdeps"
> +INSANE_SKIP_${PN}-rtos = "arch ldflags file-rdeps"
>
> INSANE_SKIP_${PN}-dbg = "arch"
> diff --git a/recipes-bsp/ipc-lld/ipc-lld.inc b/recipes-bsp/ipc-lld/ipc-lld.inc
> index 06683a06..243678f4 100644
> --- a/recipes-bsp/ipc-lld/ipc-lld.inc
> +++ b/recipes-bsp/ipc-lld/ipc-lld.inc
> @@ -18,7 +18,7 @@ SRC_URI =
> "${IPCLLD_GIT_URI};protocol=${IPCLLD_GIT_PROTOCOL};branch=${BRANCH}"
>
> SRCREV = "${IPCLLD_SRCREV}"
> PV = "01.00.00.00"
> -PR = "r1"
> +PR = "r2"
>
> # Build with make instead of XDC
> TI_PDK_XDCMAKE = "0"
> --
> 2.17.1
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
--
_______________________________________________
meta-ti mailing list
meta-ti@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-ti
