From fd223268611717f15e47686f952889af454cbae2 Mon Sep 17 00:00:00 2001 From: Shiju Sivasankaran Date: Tue, 16 Mar 2021 15:12:05 -0500 Subject: [PATCH] ti-rtos: update to uisng fw from mcu-plus-sdk for AM64x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update ti-rtos-metadata and ti-rtos-firmware recipes of meta-ti to pick AM64x rtos firmware from mcu-plus-sdk instead of PDK. Other devices such as AM65x, J7 continue to use fw from PDK. Built and tested both IPC echo test applications - "rpmsg_client_sample” & “rpmsg_char_simple”. Both tests passed for all remote R5F cores on AM64x EVM Signed-off-by: Shiju Sivasankaran [praneeth@ti.com: rebase to dunfell/next] Signed-off-by: Praneeth Bajjuri --- recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 12 ++++++++---- recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 4e08a8ee..e85948b2 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -11,17 +11,20 @@ INHIBIT_DEFAULT_DEPS = "1" inherit deploy +DEFAULT_METADATA_FILE ?= "metadata.inc" +DEFAULT_METADATA_FILE_am64xx ?= "mcusdk_metadata.inc" + # First, let's try including metadata.inc that could be fetched and deployed # by ti-rtos-metadata earlier and provide new set of CORESDK_RTOS_* variables -include ${DEPLOY_DIR_IMAGE}/metadata.inc +include ${DEPLOY_DIR_IMAGE}/${DEFAULT_METADATA_FILE} # Set some defaults for when metadata.inc is not available DEFAULT_RTOS_FAMILY = "jacinto" DEFAULT_RTOS_VERSION = "07_03_00_21" DEFAULT_RTOS_VERSION_DOT = "07.03.00.21" -DEFAULT_RTOS_VERSION_am64xx = "07_03_01_06" -DEFAULT_RTOS_VERSION_DOT_am64xx = "07.03.01.06" +DEFAULT_RTOS_VERSION_am64xx = "07_03_00_03" +DEFAULT_RTOS_VERSION_DOT_am64xx = "07.03.00.03" DEFAULT_RTOS_VERSION_am65xx = "07_03_00_22" DEFAULT_RTOS_VERSION_DOT_am65xx = "07.03.00.22" @@ -39,6 +42,7 @@ DEFAULT_RTOS_WEBLINK_am65xx = "https://software-dl.ti.com/processor-sdk-rtos/esd DEFAULT_RTOS_WEBLINK_am64xx = "https://software-dl.ti.com/processor-sdk-rtos/esd/AM64X/firmware/${CORESDK_RTOS_VERSION}" DEFAULT_FIRMWARE_FILE = "coresdk_rtos_${CORESDK_RTOS_SOC}_${CORESDK_RTOS_VERSION}_firmware.tar.xz" +DEFAULT_FIRMWARE_FILE_am64xx = "mcu_plus_sdk_${CORESDK_RTOS_SOC}_${CORESDK_RTOS_VERSION}_firmware.tar.xz" DEFAULT_FIRMWARE_URL = "file://empty" DEFAULT_FIRMWARE_URL_k3 = "${CORESDK_RTOS_WEBLINK}/${DEFAULT_FIRMWARE_FILE}" @@ -47,7 +51,7 @@ DEFAULT_FIRMWARE_SHA256SUM = "unknown" DEFAULT_FIRMWARE_SHA256SUM_j7 = "fc7805ed3d6c1801efb2b85ac9af99a8657aa3a7a9327bc16a1163d566f11c2c" DEFAULT_FIRMWARE_SHA256SUM_j7200-evm = "71f282ba6768ad3b603a17d30851cc621986c88311c174960a50196bfc79f85c" DEFAULT_FIRMWARE_SHA256SUM_am65xx = "61e0be08bea8ab1055645bd96504a6a29c70318c5b277237dee9981cd94d7f79" -DEFAULT_FIRMWARE_SHA256SUM_am64xx = "450bf23d659756695d62168fe06eebe4641522293d89692a9eea837426bac0f9" +DEFAULT_FIRMWARE_SHA256SUM_am64xx = "bc2d3d603ad30006ea3fefa3e777c26c19b95ee6d6f5a630259009f2f5a4996b" # Use weak assignment for CORESDK_RTOS_* variables to use defaults if not yet set CORESDK_RTOS_FAMILY ?= "${DEFAULT_RTOS_FAMILY}" diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb index abef8781..83e0e901 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb @@ -22,6 +22,7 @@ TI_RTOS_METADATA_SRCREV ?= "3cda650c9e22eb4fd4eb5797ad998991a6124243" TI_RTOS_METADATA_BRANCH ?= "master" TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}" TI_RTOS_METADATA_FILE ?= "${S}${TI_RTOS_METADATA_DIR}/metadata.inc" +TI_RTOS_METADATA_FILE_am64xx ?= "${S}${TI_RTOS_METADATA_DIR}/mcusdk_metadata.inc" PV = "1.0.0+git${SRCPV}"