ipc-lld: inherit update-alternatives for softlink
PATCH 1/1 ipc-lld: inherit update-alternatives for softlink
- Fixed softlink - inherit update-alternatives
- Added all-bios binaries in install
---
Changes:
- Removed 'inherit deploy'
- Updated Commit message
- Removed deploy appends
- Fixed typo in commit message
---
--- .../ipc-lld/ipc-lld-examples-rtos_git.bb | 45 +++++++------------ recipes-bsp/ipc-lld/ipc-lld.inc | 2 +- 2 files changed, 17 insertions(+), 30 deletions(-)
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +16 -29
@@ -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"
@@ -116,37 +121,19 @@ ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test ALTERNATIVE_PRIORITY = "10" -# copy the executables into the deploy directory - -do_deploy() { - : -} - -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}/ -} +#add source and all rtos binaries package +PACKAGES =+ "${PN}-src" +PACKAGES =+ "${PN}-allrtos" -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}-src += "${PDK_INSTALL_DIR_RECIPE}/packages" +FILES_${PN}-allrtos_append_am65xx += "${RTOS_ALL_CORES_BIN_DIR}/am65xx_evm" +FILES_${PN}-allrtos_append_j7-evm += "${RTOS_ALL_CORES_BIN_DIR}/j721e_evm" +FILES_${PN}-allrtos_append_am65xx += "${RTOS_2_CORES_BIN_DIR}/am65xx_evm" +FILES_${PN}-allrtos_append_j7-evm += "${RTOS_2_CORES_BIN_DIR}/j721e_evm" +FILES_${PN}-allrtos_append_am65xx += "${LINUX_2_CORES_BIN_DIR}/am65xx_evm" +FILES_${PN}-allrtos_append_j7-evm += "${LINUX_2_CORES_BIN_DIR}/j721e_evm" INSANE_SKIP_${PN} = "arch ldflags file-rdeps"
recipes-bsp/ipc-lld/ipc-lld.inc +1 -1
@@ -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"
Signature · 1 line
2.17.1
Quoted 11 lines · Santosh Jha
- Fixed softlink - inherit update-alternatives
- Added all-bios binaries in install---
Changes:
- Removed 'inherit deploy'
- Updated Commit message
- Removed deploy appends
- Fixed typo in commit message
---
Quoted 3 lines
Signed-off-by Santosh Jha <[email protected]>Signed-off-by Santosh Jha <[email protected]>
The Signed-off-by will not get into the commit (why there are 2?), because it is after --- line that lists the revision changes.
Quoted 14 lines
--- .../ipc-lld/ipc-lld-examples-rtos_git.bb | 45 +++++++------------ recipes-bsp/ipc-lld/ipc-lld.inc | 2 +- 2 files changed, 17 insertions(+), 30 deletions(-)recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +1
-0@@ -2,11 +2,16 @@ SUMMARY = "echo_test for IPC-LLD" require ipc-lld.inc +inherit update-alternatives
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb SUMMARY = "echo_test for IPC-LLD" · line 14
Quoted 10 lines
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +5
-1+ 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"
Do we need to package all the FW images? Usually we have additional <name>-rtos recipes and packages if those are not used in Linux.
Quoted 8 lines
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +0
-2DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc"@@ -116,37 +121,19 @@ ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test ALTERNATIVE_PRIORITY = "10" -# copy the executables into the deploy directory -
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test · line 125
Quoted 10 lines
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +2
-8-do_deploy() { - : -} - -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}/ -} +#add source and all rtos binaries package +PACKAGES =+ "${PN}-src"
Why is this needed? You should either use sourceipk in meta-arago, or create a different package than ${PN}-src.
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test · line 126
Quoted 1 line
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +1
-0+PACKAGES =+ "${PN}-allrtos"
What's the purpose of this package? Should it be ${PN}-rtos?
Quoted 51 lines
recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +7
-18-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}-src += "${PDK_INSTALL_DIR_RECIPE}/packages" +FILES_${PN}-allrtos_append_am65xx += "${RTOS_ALL_CORES_BIN_DIR}/am65xx_evm" +FILES_${PN}-allrtos_append_j7-evm += "${RTOS_ALL_CORES_BIN_DIR}/j721e_evm" +FILES_${PN}-allrtos_append_am65xx += "${RTOS_2_CORES_BIN_DIR}/am65xx_evm" +FILES_${PN}-allrtos_append_j7-evm += "${RTOS_2_CORES_BIN_DIR}/j721e_evm" +FILES_${PN}-allrtos_append_am65xx += "${LINUX_2_CORES_BIN_DIR}/am65xx_evm" +FILES_${PN}-allrtos_append_j7-evm += "${LINUX_2_CORES_BIN_DIR}/j721e_evm" INSANE_SKIP_${PN} = "arch ldflags file-rdeps"recipes-bsp/ipc-lld/ipc-lld.inc +1
-1@@ -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"Signature · 7 lines
2.17.1 -- _______________________________________________ meta-ti mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-ti