[meta-ti] [thud/master][PATCH 5] ipc-lld: inherit update-alternatives for softlink
Denys Dmytriyenko
denys at ti.com
Thu Oct 31 21:29:52 PDT 2019
This breaks am65xx:
| make -C /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot/usr/share/ti/ti-pdk-tree/packages/ti/drv/ipc/examples/echo_test xdc_configuro
| make[1]: Entering directory '/OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot/usr/share/ti/ti-pdk-tree/packages/ti/drv/ipc/examples/echo_test'
| # Invoking configuro...
| /bin/mkdir -p /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/git/examples/yocto_bin
| /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot-native/usr/share/ti/ti-xdctools-tree/xs xdc.tools.configuro --generationOnly -o /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/git/examples/yocto_bin/ipc_echo_test/obj/am65xx_evm/mpu1_0/release/configuro -t gnu.targets.arm.A53F -p "ti.platforms.cortexA:AM65X" \
| -r release -b --ol /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/git/examples/yocto_bin/ipc_echo_test/obj/am65xx_evm/mpu1_0/release/configuro/linker_mod.cmd /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot/usr/share/ti/ti-pdk-tree/packages/ti/build/am65xx/sysbios_a53.cfg
| xdc.tools.configuro: extraneous arguments ignored: '/OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot/usr/share/ti/ti-pdk-tree/packages/ti/build/am65xx/sysbios_a53.cfg ...'
| Usage: xs xdc.tools.configuro [--help]
| [-v | -q]
| [-@ optionsfile]
| [-o outdir]
| [-b config_bld | -c codegen_dir | --cb]
| [-t target] [-p platform[:instance]] [-r profile]
| [-Dname=value]
| [-w | -x regexp]
| [--rtsName pkg_name]
| [--cfgArgs args_string]
| [--linkTemplate linker_template]
| [--pkg] [--generationOnly]
| [--compileOptions compile_options_string]
| [--linkOptions linker_options_string]
| [--oc compiler.opt] [--ol linker.cmd]
| infile.cfg
| js: "/OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot-native/usr/share/ti/ti-xdctools-tree/packages/xdc/tools/Cmdr.xs", line 52: Error: xdc.tools.configuro: Error: can't open input file '/OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/git/examples/yocto_bin/ipc_echo_test/obj/am65xx_evm/mpu1_0/release/configuro/linker_mod.cmd'
| /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot/usr/share/ti/ti-pdk-tree/packages/ti/build/makerules/rules_a53.mk:268: recipe for target '/OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/git/examples/yocto_bin/ipc_echo_test/obj/am65xx_evm/mpu1_0/release/configuro/package/cfg/sysbios_a53_pa53fg.c' failed
| make[1]: *** [/OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/git/examples/yocto_bin/ipc_echo_test/obj/am65xx_evm/mpu1_0/release/configuro/package/cfg/sysbios_a53_pa53fg.c] Error 1
| make[1]: Leaving directory '/OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot/usr/share/ti/ti-pdk-tree/packages/ti/drv/ipc/examples/echo_test'
| /OE/arago-thud-next/build/arago-tmp-external-arm-toolchain/work/am65xx_evm-linux/ipc-lld-examples-rtos/01.00.00.00-r2/recipe-sysroot/usr/share/ti/ti-pdk-tree/packages/ti/build/comp_top.mk:380: recipe for target 'ipc_echo_test' failed
| make: *** [ipc_echo_test] Error 2
| ERROR: oe_runmake failed
On Thu, Oct 31, 2019 at 04:07:40PM -0400, Denys Dmytriyenko wrote:
> 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 <sjha at 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 at yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
More information about the meta-ti
mailing list