Skip to contentSkip to conversation

AM64 Cleanup and other updates

PATCH Superseded Dan Murphy 2 participants 13 messages Dec 17, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Dan Murphy

author
#0 lore raw

v2 cover AM64 Cleanup and other updates

Hello

This series of patches updates various SRCREVs for upcoming release candidate as well as cleans up AM64x hacks and variables that needed to be updated for AM64

Dan

Dan Murphy (9):
linux-ti-staging: Update kernel to latest commit sha
u-boot-ti: Remove unneeded variable for am64xx
machine: am64xx-evm.conf: Remove commented code and update PDK values
ti-rtos: Update metadata and versions for RTOS firmware
ti-uboot-staging: Update to the latest commit
am64xx-evm-k3r5: Update SYSFW_SOC to am64x from am65x
k3conf: Update SRCREV to latest
ti-sci-fw: Update image gen and sysfw commit SHA
prueth-fw-am65x-sr2: Updating firmware to 02.02.08.02

Praneeth Bajjuri (1):
trusted-firmware-a: Update SRCREV for AM64X support

 conf/machine/am64xx-evm-k3r5.conf             |  3 +--
 conf/machine/include/am64xx.inc               |  9 ++++----
 .../prueth-fw/prueth-fw-am65x-sr2_git.bb      |  4 ++--
 recipes-bsp/ti-sci-fw/ti-sci-fw.inc           |  5 +++--
 .../trusted-firmware-a_%.bbappend             |  2 +-
 .../u-boot/u-boot-ti-staging_2020.01.bb       |  4 ++--
 recipes-bsp/u-boot/u-boot-ti.inc              |  1 -
 recipes-devtools/k3conf/k3conf_git.bb         |  2 +-
 .../linux/linux-ti-staging-rt_5.4.bb          |  4 ++--
 recipes-kernel/linux/linux-ti-staging_5.4.bb  |  4 ++--
 recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb    | 21 +++++++++++--------
 recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb    |  2 +-
 12 files changed, 31 insertions(+), 30 deletions(-)
Signature · 1 line
2.29.2
author
#1 lore raw

PATCH v2 1/10 linux-ti-staging: Update kernel to latest commit sha

---
 recipes-kernel/linux/linux-ti-staging-rt_5.4.bb | 4 ++--
 recipes-kernel/linux/linux-ti-staging_5.4.bb    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
recipes-kernel/linux/linux-ti-staging-rt_5.4.bb +2 -2
index 2f8fe2bfec9d..faa7f6d8226e 100644
@@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
 
 BRANCH = "ti-rt-linux-5.4.y"
 
-SRCREV = "a59ca20fbcdc436be90ca38c199f9b640671fdb7"
-PV = "5.4.78+git${SRCPV}"
+SRCREV = "058c8ee4e4ae3ae72ca01b5b4b2aea8213561ab9"
+PV = "5.4.82+git${SRCPV}"
recipes-kernel/linux/linux-ti-staging_5.4.bb +2 -2
index 8275988bb1a7..cd13d6e33e13 100644
@@ -21,8 +21,8 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.4.y"
 
-SRCREV = "7a5e2e57a39a097b4dde09bad8f72a2d31dc09c4"
-PV = "5.4.78+git${SRCPV}"
+SRCREV = "73039d258adb0cac813342cc7e746e22295765fe"
+PV = "5.4.82+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "a"
Signature · 1 line
2.29.2
author
#2 lore raw

PATCH v2 2/10 u-boot-ti: Remove unneeded variable for am64xx

In reply to Dan Murphy
---
 recipes-bsp/u-boot/u-boot-ti.inc | 1 -
 1 file changed, 1 deletion(-)
recipes-bsp/u-boot/u-boot-ti.inc +0 -1
index 1770c3a1bda8..b7fd246aca6c 100644
@@ -65,7 +65,6 @@ SPL_UART_BINARY_keystone = ""
 SPL_UART_BINARY_k3r5 = ""
 SPL_UART_BINARY_lego-ev3 = ""
 SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin"
-SPL_UART_BINARY_am64xx-evm = ""
 
 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
Signature · 1 line
2.29.2
author
#3 lore raw

PATCH v2 3/10 machine: am64xx-evm.conf: Remove commented code and update PDK values

In reply to Dan Murphy
---
 conf/machine/include/am64xx.inc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
conf/machine/include/am64xx.inc +3 -6
index 79a403a93937..5a04a4388665 100644
@@ -1,7 +1,7 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY_append = ":am64xx"
 
-MACHINE_FEATURES += "screen touchscreen gpu"
+MACHINE_FEATURES += "screen touchscreen"
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
@@ -9,13 +9,10 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 KERNEL_DEVICETREE = " \
     ti/k3-am642-evm.dtb \
 "
-
-#IMAGE_BOOT_FILES += "sysfw-am64x-evm.itb"
-
 OPTEEMACHINE = "k3-am65x"
 OPTEEOUTPUTMACHINE = "k3"
 
 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am64x"
-TI_PDK_LIMIT_BOARDS = "am64xx_evm"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"
+TI_PDK_LIMIT_BOARDS = "am64x_evm"
+TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0 mcu1_1 mcu2_0 mcu2_1"
Signature · 1 line
2.29.2
author
#4 lore raw

PATCH v2 4/10 ti-rtos: Update metadata and versions for RTOS firmware

In reply to Dan Murphy
---
 recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 21 ++++++++++++---------
 recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)
recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +12 -9
index 74aac2c9fa0d..5fb33e2560e6 100644
@@ -17,17 +17,20 @@ include ${DEPLOY_DIR_IMAGE}/metadata.inc
 
 # Set some defaults for when metadata.inc is not available
 DEFAULT_RTOS_FAMILY = "jacinto"
-DEFAULT_RTOS_VERSION = "07_01_00_38"
-DEFAULT_RTOS_VERSION_DOT = "07.01.00.38"
+DEFAULT_RTOS_VERSION = "07_01_00_45"
+DEFAULT_RTOS_VERSION_DOT = "07.01.00.45"
 
-DEFAULT_RTOS_VERSION_am64xx = "07_01_03_01"
-DEFAULT_RTOS_VERSION_DOT_am64xx = "07.01.03.01"
+DEFAULT_RTOS_VERSION_am65xx = "07_01_00_55"
+DEFAULT_RTOS_VERSION_DOT_am65xx = "07.01.00.55"
+
+DEFAULT_RTOS_VERSION_am64xx = "07_01_03_09"
+DEFAULT_RTOS_VERSION_DOT_am64xx = "07.01.03.09"
 
 DEFAULT_RTOS_SOC = "undefined"
 DEFAULT_RTOS_SOC_j7 = "j721e"
 DEFAULT_RTOS_SOC_j7200-evm = "j7200"
 DEFAULT_RTOS_SOC_am65xx = "am65xx"
-DEFAULT_RTOS_SOC_am64xx = "am64xx"
+DEFAULT_RTOS_SOC_am64xx = "am64x"
 
 DEFAULT_RTOS_WEBLINK = "undefined"
 DEFAULT_RTOS_WEBLINK_j7 = "https://software-dl.ti.com/jacinto7/esd/processor-sdk-rtos-jacinto7/firmware/${CORESDK_RTOS_VERSION}"
@@ -40,10 +43,10 @@ DEFAULT_FIRMWARE_URL = "file://empty"
 DEFAULT_FIRMWARE_URL_k3 = "${CORESDK_RTOS_WEBLINK}/${DEFAULT_FIRMWARE_FILE}"
 
 DEFAULT_FIRMWARE_SHA256SUM = "unknown"
-DEFAULT_FIRMWARE_SHA256SUM_j7 = "93e4d3742a922015f3295f5c20ef4bc2b9751139ffcd5620b8df7047bff50651"
-DEFAULT_FIRMWARE_SHA256SUM_j7200-evm = "cd5071a8f6ddaec05346e4c2bbeed6dc7bcb376d6edc47f81b9aeaf38f151176"
-DEFAULT_FIRMWARE_SHA256SUM_am65xx = "e54cc8da7fefa1ebf55454b184b42c364de3eebb34a328d244b8275b7763eb58"
-DEFAULT_FIRMWARE_SHA256SUM_am64xx = "dc1a39b7a7f403235364a84ed5291666a84a5fa7fe8c136ec07d45848c1017f4"
+DEFAULT_FIRMWARE_SHA256SUM_j7 = "23e8dec2b31f126e26953eb350e9bb252c1ea5135fa96eb6621691f00a54232b"
+DEFAULT_FIRMWARE_SHA256SUM_j7200-evm = "b1c0663327fc91f280ac93be1da786f68d296abaea33a75798f3c38f8578418a"
+DEFAULT_FIRMWARE_SHA256SUM_am65xx = "688127b48bdcb273bd66f035690bf56aa4ad396ce51100a75439ea00c7695456"
+DEFAULT_FIRMWARE_SHA256SUM_am64xx = "78ef4d1b4e07995323b872ca4fa1259ff43f10cf88d40a32b84fa4ac9a5fee51"
 
 # Use weak assignment for CORESDK_RTOS_* variables to use defaults if not yet set
 CORESDK_RTOS_FAMILY ?= "${DEFAULT_RTOS_FAMILY}"
recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +1 -1
index d4f33443699a..5d5a12250311 100644
@@ -18,7 +18,7 @@ PLAT_SFX_am64xx = "/am64x"
 # Use weak assignment to set defaults to TI_RTOS_METADATA_* variables
 TI_RTOS_METADATA_URI ?= "git://git.ti.com/processor-sdk/coresdk_rtos_releases.git"
 TI_RTOS_METADATA_PROTOCOL ?= "git"
-TI_RTOS_METADATA_SRCREV ?= "d946278e9a40632d05cd1e953f5f200011be69a9"
+TI_RTOS_METADATA_SRCREV ?= "1c8107dd47298ea9b8518083ffcd2f7e91ea7c00"
 TI_RTOS_METADATA_BRANCH ?= "master"
 TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}"
 TI_RTOS_METADATA_FILE ?= "${S}${TI_RTOS_METADATA_DIR}/metadata.inc"
Signature · 1 line
2.29.2
author
#6 lore raw

PATCH v2 6/10 ti-uboot-staging: Update to the latest commit

In reply to Dan Murphy
---
 recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +2 -2
index 15dd32da66f2..1cf20c9096bc 100644
@@ -1,7 +1,7 @@
 require u-boot-ti.inc
 
-PR = "r25"
+PR = "r26"
 
 BRANCH = "ti-u-boot-2020.01"
 
-SRCREV = "10dad9df6a0eb00f45bed48c9df0c9effb4fbae5"
+SRCREV = "2df0015ffde76aad8fad6348e0ddf2b814068036"
Signature · 1 line
2.29.2
author
#8 lore raw

PATCH v2 7/10 am64xx-evm-k3r5: Update SYSFW_SOC to am64x from am65x

In reply to Dan Murphy
---
 conf/machine/am64xx-evm-k3r5.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
conf/machine/am64xx-evm-k3r5.conf +1 -2
index 26230da499af..b788e634699d 100644
@@ -4,8 +4,7 @@
 
 require conf/machine/include/k3r5.inc
 
-# UPdate for am64
-SYSFW_SOC = "am65x"
+SYSFW_SOC = "am64x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
 SYSFW_SYMLINK = "sysfw.itb"
Signature · 1 line
2.29.2
author
#9 lore raw

PATCH v2 8/10 k3conf: Update SRCREV to latest

In reply to Dan Murphy

Update the k3conf to the latest SHA to pick up AM64.

---
 recipes-devtools/k3conf/k3conf_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/k3conf/k3conf_git.bb +1 -1
index e4fa54c3bee0..5becbf97094e 100644
@@ -8,7 +8,7 @@ PV = "0.1+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"
 
 BRANCH ?= "master"
-SRCREV = "1ff0c4f429e8e33d22b52ec002d9b97bbca6bf0b"
+SRCREV = "7ee4c46379bb71dfa0677089841cb87eba9fbfea"
 
 SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}"
 
Signature · 1 line
2.29.2
author
#10 lore raw

PATCH v2 9/10 ti-sci-fw: Update image gen and sysfw commit SHA

In reply to Dan Murphy

Update the image gen and sysfw commit SHAs.
Temporarily pick up the firmware-next branch to get the AM64x firmware. This branch change will need to be reverted once the firmware is merged.

---
 recipes-bsp/ti-sci-fw/ti-sci-fw.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
recipes-bsp/ti-sci-fw/ti-sci-fw.inc +3 -2
index fe391e5fc40b..5f07ad19bd44 100644
@@ -4,10 +4,11 @@ LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
 
 PV = "2020.08b"
+PV_am64xx-evm-k3r5 = "2020.23"
 
-SRCREV = "c26c279257c13a0ff5002b09113fcff0e1d18853"
+SRCREV = "a4e232f9293be29ce1a684357112965365d6e285"
 BRANCH ?= "ti-linux-firmware"
-SRCREV_imggen = "7b4fe13d642d69a559724349aede4817891008a7"
+SRCREV_imggen = "6d023674b0655f1a7bba192d2600c08be314e9ef"
 SRCREV_FORMAT = "imggen"
 
 SRC_URI = " \
Signature · 1 line
2.29.2
author
#12 lore raw

PATCH v2 10/10 prueth-fw-am65x-sr2: Updating firmware to 02.02.08.02

In reply to Dan Murphy
---
 recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb +2 -2
index c66bee80d79c..57cf37a26933 100644
@@ -3,7 +3,7 @@ SUMMARY = "PRU Ethernet firmware for AM65xx SR2.0"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
 
-PV = "02.02.07.02"
+PV = "02.02.08.02"
 
 CLEANBROKEN = "1"
 
@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "am65xx-evm"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRCREV = "c911bcec682ef053a15f9c7d5867a0dd2da2632b"
+SRCREV = "31e626d84a3f8a5dc7175b79440972ce90a23de0"
 BRANCH ?= "ti-linux-firmware"
 
 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
Signature · 1 line
2.29.2
author
#5 lore raw

PATCH v2 5/10 trusted-firmware-a: Update SRCREV for AM64X support

In reply to Dan Murphy

From: Praneeth Bajjuri <[email protected]>

Update SRCREV to pick latest that includes AM64X support

commit 65dd16b4e ("ti: k3: Introduce lite device board support") adds support of AM64X platform in ti-atf branch.

This patch updates the SRCREV and also updates the BOARD to "lite" to build for the mentioned platform.

---
 conf/machine/include/am64xx.inc                              | 2 ++
 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
conf/machine/include/am64xx.inc +2 -0
index 5a04a4388665..20441d8a757f 100644
@@ -9,6 +9,8 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 KERNEL_DEVICETREE = " \
     ti/k3-am642-evm.dtb \
 "
+
+TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am65x"
 OPTEEOUTPUTMACHINE = "k3"
 
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +1 -1
index 4942bf46d8a3..4852c5608598 100644
@@ -2,7 +2,7 @@ PV_k3 = "2.4"
 LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 BRANCH_k3 = "ti-atf"
 SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1"
+SRCREV_tfa_k3 = "65dd16b4ea5032752af62e94ca64cff41733a123"
 COMPATIBLE_MACHINE_k3 = "k3"
 TFA_BUILD_TARGET_k3 = "all"
 TFA_INSTALL_TARGET_k3 = "bl31"
Signature · 1 line
2.29.2
#7 lore raw

Re: [meta-ti] [dunfell/master] [PATCH v2 06/10] ti-uboot-staging: Update to the latest commit

In reply to Dan Murphy
Quoted 10 lines · Dan Murphy via lists.yoctoproject.org
---
 recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +0 -0
index 15dd32da66f2..1cf20c9096bc 100644

recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb line 7

Quoted 9 lines
recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +2 -2
@@ -1,7 +1,7 @@
 require u-boot-ti.inc
 
-PR = "r25"
+PR = "r26"
 
 BRANCH = "ti-u-boot-2020.01"
 
-SRCREV = "10dad9df6a0eb00f45bed48c9df0c9effb4fbae5"
+SRCREV = "2df0015ffde76aad8fad6348e0ddf2b814068036"

This would need to be
https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2020.01&id=c32cf0dd6bc60911927548ad20973c71fce95661

please update.

Quoted 7 lines
Signature · 1 line
2.29.2
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#11 lore raw

Re: [meta-ti] [dunfell/master] [PATCH v2 09/10] ti-sci-fw: Update image gen and sysfw commit SHA

In reply to Dan Murphy
Quoted 14 lines · Dan Murphy via lists.yoctoproject.org

Update the image gen and sysfw commit SHAs.
Temporarily pick up the firmware-next branch to get the AM64x firmware. This branch change will need to be reverted once the firmware is merged.

---
 recipes-bsp/ti-sci-fw/ti-sci-fw.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
recipes-bsp/ti-sci-fw/ti-sci-fw.inc +0 -0
index fe391e5fc40b..5f07ad19bd44 100644

recipes-bsp/ti-sci-fw/ti-sci-fw.inc LICENSE = "TI-TFL" · line 9

Quoted 7 lines
recipes-bsp/ti-sci-fw/ti-sci-fw.inc +2 -1
@@ -4,10 +4,11 @@ LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
 
 PV = "2020.08b"
+PV_am64xx-evm-k3r5 = "2020.23"
 
-SRCREV = "c26c279257c13a0ff5002b09113fcff0e1d18853"
+SRCREV = "a4e232f9293be29ce1a684357112965365d6e285"

Should be https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/commit/?h=ti-linux-firmware&id=078c1bbf3d0a05b4045d4091c32e91ee1ae15ff8

Quoted 9 lines
recipes-bsp/ti-sci-fw/ti-sci-fw.inc +1 -1
 BRANCH ?= "ti-linux-firmware"
-SRCREV_imggen = "7b4fe13d642d69a559724349aede4817891008a7"
+SRCREV_imggen = "6d023674b0655f1a7bba192d2600c08be314e9ef"
 SRCREV_FORMAT = "imggen"
 
 SRC_URI = " \
Signature · 1 line
2.29.2

Also Noticed in the recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb file:

SYSFW_PREFIX_7200-hs-evm-k3r5
.. should have been (j is missing - a typo):
SYSFW_PREFIX_j7200-hs-evm-k3r5

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D