Skip to contentSkip to conversation

machine: am64xx-evm.conf: Add machine definition for AM64xx platform

PATCH In review Dan Murphy 2 participants 9 messages Dec 11, 2020 – Dec 12, 2020

lore
Share & tools
lore

Dan Murphy

author
#0 lore raw

PATCH 1/4 machine: am64xx-evm.conf: Add machine definition for AM64xx platform

The AM64 is a follow on device of the AM65xx K3 multicore SoC architecture.

---
 conf/machine/am64xx-evm-k3r5.conf | 13 +++++++++++++
 conf/machine/am64xx-evm.conf      |  7 +++++++
 conf/machine/include/am64xx.inc   | 21 +++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 conf/machine/am64xx-evm-k3r5.conf
 create mode 100644 conf/machine/am64xx-evm.conf
 create mode 100644 conf/machine/include/am64xx.inc
conf/machine/am64xx-evm-k3r5.conf new file +13 -0
new file mode 100644
index 000000000000..26230da499af
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: AM64xx EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+# UPdate for am64
+SYSFW_SOC = "am65x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_SYMLINK = "sysfw.itb"
+
+UBOOT_MACHINE = "am64x_evm_r5_defconfig"
conf/machine/am64xx-evm.conf new file +7 -0
new file mode 100644
index 000000000000..c6ba2a8735f3
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: AM64xx EVM
+#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
+
+require conf/machine/include/am64xx.inc
+
+UBOOT_MACHINE = "am64x_evm_a53_defconfig"
conf/machine/include/am64xx.inc new file +21 -0
new file mode 100644
index 000000000000..a96bda1c71e7
@@ -0,0 +1,21 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY_append = ":am64xx"
+
+MACHINE_FEATURES += "screen touchscreen gpu"
+
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
+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 = "am64xx"
+TI_PDK_LIMIT_BOARDS = "am64xx_evm"
+TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/4 linux-ti-staging: Update kernel to pick up AM64 platform

---
 recipes-kernel/linux/linux-ti-staging_5.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-ti-staging_5.4.bb +1 -1
index 0e7fa2dff29c..8275988bb1a7 100644
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.4.y"
 
-SRCREV = "673043a513673aaddded01f52124c37d0e28f4f9"
+SRCREV = "7a5e2e57a39a097b4dde09bad8f72a2d31dc09c4"
 PV = "5.4.78+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 3/4 u-boot-ti: Update u-boot to pick up AM64 architecture

In reply to Dan Murphy
---
 recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb | 4 ++--
 recipes-bsp/u-boot/u-boot-ti.inc                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +2 -2
index 4028a7a93668..15dd32da66f2 100644
@@ -1,7 +1,7 @@
 require u-boot-ti.inc
 
-PR = "r24"
+PR = "r25"
 
 BRANCH = "ti-u-boot-2020.01"
 
-SRCREV = "4bd43879837910eaf0bf45af7ec5ddfaca203ff4"
+SRCREV = "10dad9df6a0eb00f45bed48c9df0c9effb4fbae5"
recipes-bsp/u-boot/u-boot-ti.inc +1 -0
index b7fd246aca6c..1770c3a1bda8 100644
@@ -65,6 +65,7 @@ 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.17.1
author
#6 lore raw

PATCH 4/4 ti-rtos: Update metadata with AM64 firmware

In reply to Dan Murphy
---
 recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 6 ++++++
 recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +6 -0
index 01cf0fc91aa6..74aac2c9fa0d 100644
@@ -20,14 +20,19 @@ DEFAULT_RTOS_FAMILY = "jacinto"
 DEFAULT_RTOS_VERSION = "07_01_00_38"
 DEFAULT_RTOS_VERSION_DOT = "07.01.00.38"
 
+DEFAULT_RTOS_VERSION_am64xx = "07_01_03_01"
+DEFAULT_RTOS_VERSION_DOT_am64xx = "07.01.03.01"
+
 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_WEBLINK = "undefined"
 DEFAULT_RTOS_WEBLINK_j7 = "https://software-dl.ti.com/jacinto7/esd/processor-sdk-rtos-jacinto7/firmware/${CORESDK_RTOS_VERSION}"
 DEFAULT_RTOS_WEBLINK_am65xx = "https://software-dl.ti.com/processor-sdk-rtos/esd/AM65X/firmware/${CORESDK_RTOS_VERSION}"
+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"
 
@@ -38,6 +43,7 @@ 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"
 
 # 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 +2 -1
index 15c0c68cc2d8..21e7b1dc71c2 100644
@@ -13,11 +13,12 @@ PLAT_SFX = ""
 PLAT_SFX_j7 = "/j721e"
 PLAT_SFX_j7200-evm = "/j7200"
 PLAT_SFX_am65xx = "/am65xx"
+PLAT_SFX_am64xx = "/am64xx"
 
 # 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 ?= "6b63577eec787cde277d3d12b23ea80578b6ad91"
+TI_RTOS_METADATA_SRCREV ?= "d946278e9a40632d05cd1e953f5f200011be69a9"
 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.17.1
#8 lore raw
In reply to Dan Murphy

Hi Dan,

Quoted 18 lines · Dan Murphy via lists.yoctoproject.org

The AM64 is a follow on device of the AM65xx K3 multicore SoC architecture.

---
 conf/machine/am64xx-evm-k3r5.conf | 13 +++++++++++++
 conf/machine/am64xx-evm.conf      |  7 +++++++
 conf/machine/include/am64xx.inc   | 21 +++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 conf/machine/am64xx-evm-k3r5.conf
 create mode 100644 conf/machine/am64xx-evm.conf
 create mode 100644 conf/machine/include/am64xx.inc
conf/machine/am64xx-evm-k3r5.conf new file +0 -0
new file mode 100644
index 000000000000..26230da499af

conf/machine/am64xx-evm-k3r5.conf line 8

Quoted 8 lines
conf/machine/am64xx-evm-k3r5.conf new file +8 -0
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: AM64xx EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+# UPdate for am64
+SYSFW_SOC = "am65x"

Guess you are going to wait until ti-sci-fw recipe is updated. Alternatively, name this correctly, and do not include the ti-sci-fw recipe for now for AM64xx. This should be ready the next business day.

Quoted 24 lines
conf/machine/am64xx-evm-k3r5.conf new file +5 -0
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_SYMLINK = "sysfw.itb"
+
+UBOOT_MACHINE = "am64x_evm_r5_defconfig"
conf/machine/am64xx-evm.conf new file +7 -0
new file mode 100644
index 000000000000..c6ba2a8735f3
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: AM64xx EVM
+#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
+
+require conf/machine/include/am64xx.inc
+
+UBOOT_MACHINE = "am64x_evm_a53_defconfig"
conf/machine/include/am64xx.inc new file +0 -0
new file mode 100644
index 000000000000..a96bda1c71e7

conf/machine/include/am64xx.inc line 4

Quoted 4 lines
conf/machine/include/am64xx.inc new file +4 -0
@@ -0,0 +1,21 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY_append = ":am64xx"
+
+MACHINE_FEATURES += "screen touchscreen gpu"

Hmm, is this list accurate actually? AFAIK, there's no GPU or does this signify something else?

conf/machine/include/am64xx.inc line 13

Quoted 9 lines
conf/machine/include/am64xx.inc new file +9 -0
+
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am642-evm.dtb \
+"
+
+#IMAGE_BOOT_FILES += "sysfw-am64x-evm.itb"

Get rid of this line..

conf/machine/include/am64xx.inc line 20

Quoted 7 lines
conf/machine/include/am64xx.inc new file +7 -0
+
+OPTEEMACHINE = "k3-am65x"
+OPTEEOUTPUTMACHINE = "k3"
+
+# Set the list of device targets for ti-pdk class recipes
+TI_PDK_LIMIT_SOCS = "am64xx"
+TI_PDK_LIMIT_BOARDS = "am64xx_evm"

The PDK SoC and board defined are am64x and am64x_evm as per the PDK sources.

conf/machine/include/am64xx.inc line 21

Quoted 1 line
conf/machine/include/am64xx.inc new file +1 -0
+TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"

You need to add additional cores, mcu1_1 mcu2_0 and mcu2_1

regards
Suman

Quoted 5 lines
#2 lore raw

Re: [meta-ti] [PATCH 2/4] linux-ti-staging: Update kernel to pick up AM64 platform

In reply to Dan Murphy
Quoted 10 lines · Dan Murphy via lists.yoctoproject.org
---
 recipes-kernel/linux/linux-ti-staging_5.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-ti-staging_5.4.bb +0 -0
index 0e7fa2dff29c..8275988bb1a7 100644

recipes-kernel/linux/linux-ti-staging_5.4.bb S = "${WORKDIR}/git" · line 24

Quoted 5 lines
recipes-kernel/linux/linux-ti-staging_5.4.bb +1 -1
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.4.y"
 
-SRCREV = "673043a513673aaddded01f52124c37d0e28f4f9"
+SRCREV = "7a5e2e57a39a097b4dde09bad8f72a2d31dc09c4"

You can probably merge this patch first in preparation. Also, the SHA is already stale, might just pick the latest, even 5.4.82..

regards
Suman

Quoted 8 lines
recipes-kernel/linux/linux-ti-staging_5.4.bb +0 -0
 PV = "5.4.78+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
#5 lore raw

Re: [meta-ti] [PATCH 3/4] u-boot-ti: Update u-boot to pick up AM64 architecture

In reply to Dan Murphy
Quoted 25 lines · Dan Murphy via lists.yoctoproject.org
---
 recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb | 4 ++--
 recipes-bsp/u-boot/u-boot-ti.inc                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +2 -2
index 4028a7a93668..15dd32da66f2 100644
@@ -1,7 +1,7 @@
 require u-boot-ti.inc
 
-PR = "r24"
+PR = "r25"
 
 BRANCH = "ti-u-boot-2020.01"
 
-SRCREV = "4bd43879837910eaf0bf45af7ec5ddfaca203ff4"
+SRCREV = "10dad9df6a0eb00f45bed48c9df0c9effb4fbae5"
recipes-bsp/u-boot/u-boot-ti.inc +0 -0
index b7fd246aca6c..1770c3a1bda8 100644

recipes-bsp/u-boot/u-boot-ti.inc SPL_UART_BINARY_keystone = "" · line 68

Quoted 4 lines
recipes-bsp/u-boot/u-boot-ti.inc +1 -0
@@ -65,6 +65,7 @@ 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 = ""

Why do we need this? I don't see any for AM65xx.

regards
Suman

Quoted 8 lines
recipes-bsp/u-boot/u-boot-ti.inc +0 -0
 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
 
#7 lore raw

Re: [meta-ti] [PATCH 4/4] ti-rtos: Update metadata with AM64 firmware

In reply to Dan Murphy
Quoted 12 lines · Dan Murphy via lists.yoctoproject.org
---
 recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 6 ++++++
 recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +0 -0
index 01cf0fc91aa6..74aac2c9fa0d 100644
@@ -20,14 +20,19 @@ DEFAULT_RTOS_FAMILY = "jacinto"
 DEFAULT_RTOS_VERSION = "07_01_00_38"

recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb DEFAULT_RTOS_FAMILY = "jacinto" · line 30

Quoted 10 lines
recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +4 -0
 DEFAULT_RTOS_VERSION_DOT = "07.01.00.38"
 
+DEFAULT_RTOS_VERSION_am64xx = "07_01_03_01"
+DEFAULT_RTOS_VERSION_DOT_am64xx = "07.01.03.01"
+
 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"

I believe this should be am64x, atleast thats the name used in the metadata.inc files.

Quoted 21 lines
recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +2 -0
 DEFAULT_RTOS_WEBLINK = "undefined"
 DEFAULT_RTOS_WEBLINK_j7 = "https://software-dl.ti.com/jacinto7/esd/processor-sdk-rtos-jacinto7/firmware/${CORESDK_RTOS_VERSION}"
 DEFAULT_RTOS_WEBLINK_am65xx = "https://software-dl.ti.com/processor-sdk-rtos/esd/AM65X/firmware/${CORESDK_RTOS_VERSION}"
+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"
 
@@ -38,6 +43,7 @@ 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"
 
 # 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 +0 -0
index 15c0c68cc2d8..21e7b1dc71c2 100644

recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb PLAT_SFX = "" · line 16

Quoted 4 lines
recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +1 -0
@@ -13,11 +13,12 @@ PLAT_SFX = ""
 PLAT_SFX_j7 = "/j721e"
 PLAT_SFX_j7200-evm = "/j7200"
 PLAT_SFX_am65xx = "/am65xx"
+PLAT_SFX_am64xx = "/am64xx"

Did you submit the wrong patch? I see this as /am64x on the -next branch, which is correct.

regards
Suman

Quoted 14 lines
recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +1 -1
 # 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 ?= "6b63577eec787cde277d3d12b23ea80578b6ad91"
+TI_RTOS_METADATA_SRCREV ?= "d946278e9a40632d05cd1e953f5f200011be69a9"
 TI_RTOS_METADATA_BRANCH ?= "master"
 TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}"
 TI_RTOS_METADATA_FILE ?= "${S}${TI_RTOS_METADATA_DIR}/metadata.inc"
 
author
#3 lore raw

Re: [meta-ti] [PATCH 2/4] linux-ti-staging: Update kernel to pick up AM64 platform

In reply to Suman Anna

Suman

Quoted 12 lines · Suman Anna
Quoted 11 lines · Dan Murphy via lists.yoctoproject.org
---
  recipes-kernel/linux/linux-ti-staging_5.4.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-ti-staging_5.4.bb +0 -0
index 0e7fa2dff29c..8275988bb1a7 100644
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
 
Quoted 7 lines

recipes-kernel/linux/linux-ti-staging_5.4.bb S = "${WORKDIR}/git" · line 24

Quoted 4 lines
recipes-kernel/linux/linux-ti-staging_5.4.bb +1 -1
  BRANCH = "ti-linux-5.4.y"
 
-SRCREV = "673043a513673aaddded01f52124c37d0e28f4f9"
+SRCREV = "7a5e2e57a39a097b4dde09bad8f72a2d31dc09c4"

You can probably merge this patch first in preparation. Also, the SHA is already stale, might just pick the latest, even 5.4.82..

OK I will send another patch to update the SHA and rev

Dan