From e21c11b4a44417f67c78503bc3f954c175ac20e2 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 11 Aug 2021 14:39:05 -0400 Subject: meta-ti: convert to new override syntax in honister Upcoming "honister" release changes the override syntax to improve usability, speed and memory footprint. Update recipes with the new syntax and set layer compatibility to honister. Signed-off-by: Denys Dmytriyenko Tested-by: Paul Barker Signed-off-by: Yogesh Siraswar --- recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb | 48 ++++++++++++------------ recipes-bsp/ipc-lld/ipc-lld-fw_git.bb | 42 ++++++++++----------- recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb | 6 +-- recipes-bsp/ipc-lld/ipc-lld.inc | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) (limited to 'recipes-bsp/ipc-lld') 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 79e5bdb9..3fb6884f 100644 --- a/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +++ b/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb @@ -16,7 +16,7 @@ LINUX_2_CORES_BAREMETAL_BIN_DIR = "${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_e DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc" -TI_PDK_LIMIT_BOARDS_j7 = "j721e_evm" +TI_PDK_LIMIT_BOARDS:j7 = "j721e_evm" do_configure[noexec] = "1" @@ -62,7 +62,7 @@ do_install() { done } -do_install_append_j7() { +do_install:append:j7() { #copy ipc_echo_testb binaries for J721 install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release.xer5f ${D}${DST_BIN_PATH} install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release.xer5f ${D}${DST_BIN_PATH} @@ -79,16 +79,16 @@ do_install_append_j7() { install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release_strip.xer5f ${D}${DST_BIN_PATH} } -do_install_append_am65xx() { +do_install:append:am65xx() { cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin -d ${D}/ex04_linux_baremetal_2core_echo_test } # Set up names for the firmwares -ALTERNATIVE_${PN}_am65xx = "\ +ALTERNATIVE:${PN}:am65xx = "\ am65x-mcu-r5f0_0-fw \ am65x-mcu-r5f0_1-fw \ " -ALTERNATIVE_${PN}_j7 = "\ +ALTERNATIVE:${PN}:j7 = "\ j7-mcu-r5f0_0-fw \ j7-mcu-r5f0_1-fw \ j7-main-r5f0_0-fw \ @@ -102,18 +102,18 @@ ALTERNATIVE_${PN}_j7 = "\ # Set up link names for the firmwares -TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw" +TARGET_MCU_R5FSS0_0:am65xx = "am65x-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1:am65xx = "am65x-mcu-r5f0_1-fw" -TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1_j7 = "j7-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0_j7 = "j7-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1_j7 = "j7-main-r5f1_1-fw" -TARGET_C66_0_j7 = "j7-c66_0-fw" -TARGET_C66_1_j7 = "j7-c66_1-fw" -TARGET_C7X_j7 = "j7-c71_0-fw" +TARGET_MCU_R5FSS0_0:j7 = "j7-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1:j7 = "j7-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0:j7 = "j7-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1:j7 = "j7-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0:j7 = "j7-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1:j7 = "j7-main-r5f1_1-fw" +TARGET_C66_0:j7 = "j7-c66_0-fw" +TARGET_C66_1:j7 = "j7-c66_1-fw" +TARGET_C7X:j7 = "j7-c71_0-fw" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" @@ -149,14 +149,14 @@ ALTERNATIVE_PRIORITY = "10" PACKAGES =+ "${PN}-rtos" # make sure that lib/firmware, and all its contents are part of the package -FILES_${PN} += "${base_libdir}/firmware" +FILES:${PN} += "${base_libdir}/firmware" -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" -FILES_${PN}-rtos += "ex04_linux_baremetal_2core_echo_test" +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" +FILES:${PN}-rtos += "ex04_linux_baremetal_2core_echo_test" -INSANE_SKIP_${PN} = "arch ldflags file-rdeps" -INSANE_SKIP_${PN}-rtos = "arch ldflags file-rdeps" +INSANE_SKIP:${PN} = "arch ldflags file-rdeps" +INSANE_SKIP:${PN}-rtos = "arch ldflags file-rdeps" -INSANE_SKIP_${PN}-dbg = "arch" +INSANE_SKIP:${PN}-dbg = "arch" diff --git a/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb b/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb index 1be28365..efc56562 100644 --- a/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb +++ b/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb @@ -22,25 +22,25 @@ S = "${WORKDIR}/git" AM65X_R5_FW_DIR = "${S}/examples/echo_test/binaries/am65xx" J721E_R5_DSP_FW_DIR = "${S}/examples/echo_test/binaries/j721e" -PLATFORM_am65xx = "am65xx" -PLATFORM_j7 = "j7-evm" +PLATFORM:am65xx = "am65xx" +PLATFORM:j7 = "j7-evm" # make sure that lib/firmware, and all its contents are part of the package -FILES_${PN} += "${base_libdir}/firmware" +FILES:${PN} += "${base_libdir}/firmware" # install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level do_install() { install -d ${D}${base_libdir}/firmware/pdk-ipc } -do_install_append_am65xx() { +do_install:append:am65xx() { install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ } -do_install_append_j7() { +do_install:append:j7() { install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ @@ -74,11 +74,11 @@ do_install_append_j7() { } # Set up names for the firmwares -ALTERNATIVE_${PN}_am65xx = "\ +ALTERNATIVE:${PN}:am65xx = "\ am65x-mcu-r5f0_0-fw \ am65x-mcu-r5f0_1-fw \ " -ALTERNATIVE_${PN}_j7 = "\ +ALTERNATIVE:${PN}:j7 = "\ j7-mcu-r5f0_0-fw \ j7-mcu-r5f0_1-fw \ j7-main-r5f0_0-fw \ @@ -92,18 +92,18 @@ ALTERNATIVE_${PN}_j7 = "\ # Set up link names for the firmwares -TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw" +TARGET_MCU_R5FSS0_0:am65xx = "am65x-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1:am65xx = "am65x-mcu-r5f0_1-fw" -TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1_j7 = "j7-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0_j7 = "j7-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1_j7 = "j7-main-r5f1_1-fw" -TARGET_C66_0_j7 = "j7-c66_0-fw" -TARGET_C66_1_j7 = "j7-c66_1-fw" -TARGET_C7X_j7 = "j7-c71_0-fw" +TARGET_MCU_R5FSS0_0:j7 = "j7-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1:j7 = "j7-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0:j7 = "j7-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1:j7 = "j7-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0:j7 = "j7-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1:j7 = "j7-main-r5f1_1-fw" +TARGET_C66_0:j7 = "j7-c66_0-fw" +TARGET_C66_1:j7 = "j7-c66_1-fw" +TARGET_C7X:j7 = "j7-c71_0-fw" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" @@ -141,14 +141,14 @@ do_deploy() { : } -do_deploy_am65xx() { +do_deploy:am65xx() { install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/ install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/ install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.xer5f ${DEPLOYDIR}/ install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/ } -do_deploy_j7() { +do_deploy:j7() { install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/ install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/ install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${DEPLOYDIR}/ @@ -189,7 +189,7 @@ INHIBIT_SYSROOT_STRIP = "1" # This is used to prevent the build system to split the debug info in a separate file INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP -INSANE_SKIP_${PN} += "arch" +INSANE_SKIP:${PN} += "arch" # we don't want to configure and build the source code do_compile[noexec] = "1" diff --git a/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb b/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb index e005ea70..34f1f035 100644 --- a/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb +++ b/recipes-bsp/ipc-lld/ipc-lld-rtos_git.bb @@ -38,8 +38,8 @@ do_install() { find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/ipc \; } -FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages" +FILES:${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages" -INSANE_SKIP_${PN} = "arch ldflags file-rdeps" +INSANE_SKIP:${PN} = "arch ldflags file-rdeps" -INSANE_SKIP_${PN}-dbg = "arch" +INSANE_SKIP:${PN}-dbg = "arch" diff --git a/recipes-bsp/ipc-lld/ipc-lld.inc b/recipes-bsp/ipc-lld/ipc-lld.inc index 2aea055f..6537f520 100644 --- a/recipes-bsp/ipc-lld/ipc-lld.inc +++ b/recipes-bsp/ipc-lld/ipc-lld.inc @@ -26,4 +26,4 @@ PDK_COMP_LINK_TEXT = "IPCLLD" EXTRA_OEMAKE = "PDK_INSTALL_PATH=${PDK_INSTALL_PATH} " -TI_PDK_LIMIT_CORES_append_am65xx-evm = " mcu1_1 " +TI_PDK_LIMIT_CORES:append:am65xx-evm = " mcu1_1 " -- cgit v1.2.3-54-g00ecf