* [kirkstone][PATCH 01/54] conf: machine: Add J784S4 hs platform
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 02/54] j784s4-hs: changes to support new " Denys Dmytriyenko
` (52 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Manorit Chawdhry <m-chawdhry@ti.com>
Machine conf for J784S4 HS platform.
Used J721S2 hs as reference.
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf | 11 +++++++++++
meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 11 +++++++++++
2 files changed, 22 insertions(+)
create mode 100644 meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
create mode 100644 meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
new file mode 100644
index 00000000..80a228a0
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J784S4 HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
new file mode 100644
index 00000000..62357d62
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J784S4 HS EVM
+#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM
+
+require conf/machine/j784s4-evm.conf
+
+UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 02/54] j784s4-hs: changes to support new hs platform
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 01/54] conf: machine: Add J784S4 hs platform Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 03/54] optee-os: Update SRCREV for OP-TEE TRNG in AM62X Denys Dmytriyenko
` (51 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Manorit Chawdhry <m-chawdhry@ti.com>
Changes to support new j784s4-hs platform in:
1) ti-sci-fw_git: Update firmware prefix for j784s4-hs
2) atf: sign the image
4) optee: sign the image
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 46d5111d..eb641270 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -36,6 +36,7 @@ SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:j721s2-evm-k3r5 = "fs"
SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
+SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 03/54] optee-os: Update SRCREV for OP-TEE TRNG in AM62X
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 01/54] conf: machine: Add J784S4 hs platform Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 02/54] j784s4-hs: changes to support new " Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 04/54] conf: omap-a15: Fix parsing when KERNEL_DEVICETREE is not set Denys Dmytriyenko
` (50 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Kamlesh Gurudasani <kamlesh@ti.com>
Update the SRCREV to the commit when trng support was
added in upstream OP-TEE for am62x platform to access rng.
Also, enable trng support as trng support is added now in OP-TEE
Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com>
Acked-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
index 1e0072ef..c48c56ef 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
@@ -1,13 +1,11 @@
PV:ti-soc = "3.19.0+git${SRCPV}"
-SRCREV:ti-soc = "afacf356f9593a7f83cae9f96026824ec242ff52"
+SRCREV:ti-soc = "d6c5d0037b46f46caf71d67d7825d4b722cbcddf"
# Use TI SECDEV for signing
inherit ti-secdev
EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
-EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
-
do_compile:append:k3() {
( cd ${B}/core/; \
cp tee-pager_v2.bin ${B}/bl32.bin; \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 04/54] conf: omap-a15: Fix parsing when KERNEL_DEVICETREE is not set
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (2 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 03/54] optee-os: Update SRCREV for OP-TEE TRNG in AM62X Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 05/54] conf: Remove vmlinux.gz from KERNEL_IMAGETYPES Denys Dmytriyenko
` (49 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Zachary Booth <zachary.booth@garmin.com>
Correctly handle parsing when KERNEL_DEVICETREE is not set.
Signed-off-by: Zachary Booth <zachary.booth@garmin.com>
Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index bc6add02..49db1cb6 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -23,7 +23,7 @@ UBOOT_ARCH = "arm"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
-DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}"
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
# Generate an extlinux.conf file
UBOOT_EXTLINUX = "1"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 05/54] conf: Remove vmlinux.gz from KERNEL_IMAGETYPES
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (3 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 04/54] conf: omap-a15: Fix parsing when KERNEL_DEVICETREE is not set Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 06/54] machine: Add am62axx evm configuration Denys Dmytriyenko
` (48 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Ryan Eatmon <reatmon@ti.com>
With a recent patch to the TI kernel that includes debug symbols,
the vmlinux.gz file grew in size that impacted the testing.
This file is not needed to be in the final image so remove it
from the list.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/include/k3.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 3b59645b..e4ef2f94 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
KERNEL_IMAGETYPE = "Image"
-KERNEL_IMAGETYPES = "Image vmlinux.gz fitImage"
+KERNEL_IMAGETYPES = "Image fitImage"
KERNEL_CLASSES += "kernel-fitimage"
UBOOT_ARCH = "arm"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 06/54] machine: Add am62axx evm configuration
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (4 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 05/54] conf: Remove vmlinux.gz from KERNEL_IMAGETYPES Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 07/54] optee-os: Revert to lower log level for AM62x Denys Dmytriyenko
` (47 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Paresh Bhagat <p-bhagat@ti.com>
Lets add the basic AM62Axx-evm configuration.
- Add configurations.
- Add firmware overrides.
- Add u-boot overrides.
- Add tifs-lpm-stub.
- Add cnm-wave-fw.
Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../conf/machine/am62axx-evm-k3r5.conf | 11 ++++
meta-ti-bsp/conf/machine/am62axx-evm.conf | 11 ++++
meta-ti-bsp/conf/machine/include/am62axx.inc | 15 +++++
.../cnm-wave-fw/cnm-wave-fw_git.bb | 2 +-
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 +
.../tifs-lpm-stub/tifs-lpm-stub_git.bb | 2 +-
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 1 +
.../recipes-kernel/linux/kernel-rdepends.inc | 2 +
.../ti-rtos-bin/ti-rtos-firmware.bb | 65 +++++++++++++------
9 files changed, 87 insertions(+), 23 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
create mode 100644 meta-ti-bsp/conf/machine/am62axx-evm.conf
create mode 100644 meta-ti-bsp/conf/machine/include/am62axx.inc
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
new file mode 100644
index 00000000..ca30537f
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM62AXX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
new file mode 100644
index 00000000..4eb179f3
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM62AXX EVM
+#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM
+
+require conf/machine/include/am62axx.inc
+
+KERNEL_DEVICETREE = " \
+ ti/k3-am62a7-sk.dtb \
+"
+
+UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
new file mode 100644
index 00000000..cc477366
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -0,0 +1,15 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":am62axx"
+
+MACHINE_FEATURES += "screen touchscreen"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+
+TFA_BOARD = "lite"
+OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
index e7aa9ef4..2f75f4e3 100644
--- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -13,7 +13,7 @@ PR = "${INC_PR}.1"
CLEANBROKEN = "1"
-COMPATIBLE_MACHINE = "j721s2|j784s4"
+COMPATIBLE_MACHINE = "j721s2|j784s4|am62axx"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index eb641270..37d022e9 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
+SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
diff --git a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb
index ce5f4e1f..2db761ba 100644
--- a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb
+++ b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
CLEANBROKEN = "1"
-COMPATIBLE_MACHINE = "am62xx"
+COMPATIBLE_MACHINE = "am62xx|am62axx"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index 83c4af59..4f73a7b9 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -37,6 +37,7 @@ PACKAGECONFIG:append:j7200 = " dm"
PACKAGECONFIG:append:j721s2 = " dm"
PACKAGECONFIG:append:j784s4 = " dm"
PACKAGECONFIG:append:am62xx = " dm"
+PACKAGECONFIG:append:am62axx = " dm"
COMPATIBLE_MACHINE = "(ti-soc)"
diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
index 808a4766..69796915 100644
--- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
@@ -30,6 +30,8 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " vxd-dec-fw"
# Add run-time dependency for Chips&Media Wave521 firmware to the rootfs
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw"
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw"
# Add run-time dependency for TIFS Low Power Module stub
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx = " tifs-lpm-stub"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " tifs-lpm-stub"
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index ddfa07be..9b94a61e 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -20,6 +20,7 @@ PLAT_SFX:j784s4 = "j784s4"
PLAT_SFX:am65xx = "am65xx"
PLAT_SFX:am64xx = "am64xx"
PLAT_SFX:am62xx = "am62xx"
+PLAT_SFX:am62axx = "am62axx"
FILESEXTRAPATHS:prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"
require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -63,31 +64,34 @@ C7X_4_FW = "ipc_echo_test_c7x_4_release_strip.xe71"
ETH_FW = "app_remoteswitchcfg_server_strip.xer5f"
DM_FW_LIST = ""
-DM_FW_LIST:am65xx = ""
-DM_FW_LIST:j721e = "${DM_FIRMWARE}"
-DM_FW_LIST:j7200 = "${DM_FIRMWARE}"
-DM_FW_LIST:j721s2 = "${DM_FIRMWARE}"
-DM_FW_LIST:am64xx = ""
-DM_FW_LIST:am62xx = "${DM_FIRMWARE}"
-DM_FW_LIST:j784s4 = "${DM_FIRMWARE}"
+DM_FW_LIST:am65xx = ""
+DM_FW_LIST:j721e = "${DM_FIRMWARE}"
+DM_FW_LIST:j7200 = "${DM_FIRMWARE}"
+DM_FW_LIST:j721s2 = "${DM_FIRMWARE}"
+DM_FW_LIST:am64xx = ""
+DM_FW_LIST:am62xx = "${DM_FIRMWARE}"
+DM_FW_LIST:am62axx = "${DM_FIRMWARE}"
+DM_FW_LIST:j784s4 = "${DM_FIRMWARE}"
IPC_FW_LIST = ""
-IPC_FW_LIST:am65xx = "${MCU_1_0_FW} ${MCU_1_1_FW}"
-IPC_FW_LIST:j721e = " ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}"
-IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}"
-IPC_FW_LIST:j721s2 = " ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_2_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW}"
-IPC_FW_LIST:am64xx = "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW}"
-IPC_FW_LIST:am62xx = " ${MCU_2_0_FW}"
-IPC_FW_LIST:j784s4 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}"
+IPC_FW_LIST:am65xx = "${MCU_1_0_FW} ${MCU_1_1_FW}"
+IPC_FW_LIST:j721e = " ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}"
+IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}"
+IPC_FW_LIST:j721s2 = " ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_2_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW}"
+IPC_FW_LIST:am64xx = "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW}"
+IPC_FW_LIST:am62xx = " ${MCU_2_0_FW}"
+IPC_FW_LIST:am62axx = " ${MCU_2_0_FW} ${C7X_1_FW}"
+IPC_FW_LIST:j784s4 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}"
ETH_FW_LIST = ""
-ETH_FW_LIST:am65xx = ""
-ETH_FW_LIST:j721e = "${ETH_FW}"
-ETH_FW_LIST:j7200 = "${ETH_FW}"
-ETH_FW_LIST:j721s2 = ""
-ETH_FW_LIST:am64xx = ""
-ETH_FW_LIST:am62xx = ""
-ETH_FW_LIST:j784s4 = "${ETH_FW}"
+ETH_FW_LIST:am65xx = ""
+ETH_FW_LIST:j721e = "${ETH_FW}"
+ETH_FW_LIST:j7200 = "${ETH_FW}"
+ETH_FW_LIST:j721s2 = ""
+ETH_FW_LIST:am64xx = ""
+ETH_FW_LIST:am62xx = ""
+ETH_FW_LIST:am62axx = ""
+ETH_FW_LIST:j784s4 = "${ETH_FW}"
# Update the am64xx ipc binaries to be consistent with other platforms
do_install:prepend:am64xx() {
@@ -107,6 +111,13 @@ do_install:prepend:am62xx() {
)
}
+# Update the am62axx ipc binaries to be consistent with other platforms
+do_install:prepend:am62axx() {
+ ( cd ${RTOS_IPC_FW_DIR}; \
+ ln -s am62a-mcu-r5f0_0-fw ${MCU_1_0_FW}; \
+ )
+}
+
# Sign the firmware
do_install:prepend() {
# DM Firmware
@@ -183,6 +194,11 @@ ALTERNATIVE:${PN}:am62xx = "\
am62-main-r5f0_0-fw \
"
+ALTERNATIVE:${PN}:am62axx = "\
+ am62a-mcu-r5f0_0-fw \
+ am62a-c71_0-fw \
+ "
+
ALTERNATIVE:${PN}:j721e = "\
j7-mcu-r5f0_0-fw \
j7-mcu-r5f0_1-fw \
@@ -257,6 +273,9 @@ ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am6
ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw"
ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw"
+ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62a-mcu-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[am62a-c71_0-fw] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw"
+
ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_0-fw"
ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw"
ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw"
@@ -326,6 +345,10 @@ ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ip
ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE}"
ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/${MCU_2_0_FW}"
+ALTERNATIVE_TARGET[am62a-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE}"
+ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/${MCU_2_0_FW}"
+ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/${C7X_1_FW}"
+
ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE}"
ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/${MCU_1_1_FW}"
ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ethfw/${ETH_FW}"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 07/54] optee-os: Revert to lower log level for AM62x
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (5 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 06/54] machine: Add am62axx evm configuration Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 08/54] optee: update optee-client, optee-test, optee-examples to 3.19 tag Denys Dmytriyenko
` (46 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Kamlesh Gurudasani <kamlesh@ti.com>
While removing SOFTWARE_PRNG support
commit:98506a4a07363a1b57012ccfaee263f47e5b46c4,
accidently removed the changes applied
by commit:27641e1f2d7f6696fd7bbd8f24fcac20766b6234
(optee-os: Lower log level for AM62x).
Reverting those changes back
Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
index c48c56ef..662a3c31 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
@@ -6,6 +6,8 @@ inherit ti-secdev
EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
+EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
+
do_compile:append:k3() {
( cd ${B}/core/; \
cp tee-pager_v2.bin ${B}/bl32.bin; \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 08/54] optee: update optee-client, optee-test, optee-examples to 3.19 tag
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (6 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 07/54] optee-os: Revert to lower log level for AM62x Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 09/54] ipc: ti-rpmsg-char: Update library to 0.5.2 Denys Dmytriyenko
` (45 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Manorit Chawdhry <m-chawdhry@ti.com>
optee-os was updated to 3.19 tag but the others were still outdated.
Updates other optee components to 3.19 tag
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../recipes-security/optee/optee-client_3.16%.bbappend | 6 ++++--
.../recipes-security/optee/optee-examples_%.bbappend | 4 ++--
meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend
index 109d451c..61760b8e 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend
@@ -1,2 +1,4 @@
-PV:ti-soc = "3.17.0+git${SRCPV}"
-SRCREV:ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
+PV:ti-soc = "3.19.0+git${SRCPV}"
+SRCREV:ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951"
+
+DEPENDS:append:ti-soc = "pkgconfig util-linux"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
index 98b5bea4..9c757f11 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
@@ -1,2 +1,2 @@
-PV:ti-soc = "3.17.0+git${SRCPV}"
-SRCREV:ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
+PV:ti-soc = "3.19.0+git${SRCPV}"
+SRCREV:ti-soc = "f301ee9df2129c0db683e726c91dc2cefe4cdb65"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
index 4fbaa4c4..b9e803c5 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
@@ -1,3 +1,3 @@
-PV:ti-soc = "3.17.0+git${SRCPV}"
-SRCREV:ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25"
+PV:ti-soc = "3.19.0+git${SRCPV}"
+SRCREV:ti-soc = "ab9863cc187724e54c032b738c28bd6e9460a4db"
SRC_URI:ti-soc = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 09/54] ipc: ti-rpmsg-char: Update library to 0.5.2
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (7 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 08/54] optee: update optee-client, optee-test, optee-examples to 3.19 tag Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 10/54] optee-os: Lower log level for am62axx Denys Dmytriyenko
` (44 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Devarsh Thakkar <devarsht@ti.com>
Update library to 0.5.2 as it adds support for AM62A
SoC.
Co-Authored-By: Sai Sree Kartheek Adivi <s-adivi@ti.com>
Signed-off-by: Devarsh Thakkar <devarsht@ti.com>
Acked-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
index d21dcbf3..dff13640 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
@@ -7,10 +7,10 @@ PROTOCOL = "https"
BRANCH = "master"
SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"
-# Initial 0.5.1 release
-SRCREV = "adb964ee72f99545e2ad55c50cfd14015a7d837e"
+# Initial 0.5.2 release
+SRCREV = "1da3e1bd0412c148ab57690940fea5d129220896"
-PV = "0.5.1+git${SRCPV}"
+PV = "0.5.2+git${SRCPV}"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 10/54] optee-os: Lower log level for am62axx
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (8 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 09/54] ipc: ti-rpmsg-char: Update library to 0.5.2 Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration Denys Dmytriyenko
` (43 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Praneeth Bajjuri <praneeth@ti.com>
Lower the log level for am62axx platform
commit 27641e1f2d7f ("optee-os: Lower log level for AM62x")
changes the log level for am62xx platforms.
This patch is to extend the same for am62axx
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Reported-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
index 662a3c31..2aa34530 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
@@ -7,6 +7,7 @@ inherit ti-secdev
EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
+EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
do_compile:append:k3() {
( cd ${B}/core/; \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (9 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 10/54] optee-os: Lower log level for am62axx Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-21 16:11 ` [meta-ti] " Ryan Eatmon
2023-03-20 3:37 ` [kirkstone][PATCH 12/54] hs: Deploy the unsigned versions of bl31 and bl32 Denys Dmytriyenko
` (42 subsequent siblings)
53 siblings, 1 reply; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Chirag Shilwant <c-shilwant@ti.com>
Lets add the basic AM62Q HS-SE configuration.
- Add configurations.
- Add ti-sci-firmware overrides.
- Add u-boot overrides.
- Add optee overrides.
- Add ti-rtos-firmware overrides.
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 14 ++++++++++++++
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 12 ++++++++++--
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 6 +++++-
meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 16 ++++++++++++++++
meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf | 3 +++
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 +
6 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
create mode 100644 meta-ti-bsp/conf/machine/include/am62xx-lp.inc
create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
new file mode 100644
index 00000000..11e70342
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62xx LPSK HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-SE EVM (R5F core)
+
+# Booting HS-SE requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-hs-se"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
index ca4ced5a..15ecc677 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -1,11 +1,19 @@
#@TYPE: Machine
-#@NAME: AM62XX LP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx LP EVM (R5F core)
+#@NAME: AM62XX LP GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-gp"
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = ""
+
UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index ec9ce596..be95f33a 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -2,7 +2,7 @@
#@NAME: AM62XX LP EVM
#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-require conf/machine/include/am62xx.inc
+require conf/machine/include/am62xx-lp.inc
KERNEL_DEVICETREE = " \
ti/k3-am62x-lp-sk.dtb \
@@ -11,4 +11,8 @@ KERNEL_DEVICETREE = " \
ti/k3-am625-sk-csi2-ov5640.dtbo \
"
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
+
UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
new file mode 100644
index 00000000..df113003
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
@@ -0,0 +1,16 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":am62xx"
+
+MACHINE_FEATURES += "screen touchscreen"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+# Default tiboot3.bin on AM62x LP is for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+
+TFA_BOARD = "lite"
+OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
new file mode 100644
index 00000000..7e3d7dae
--- /dev/null
+++ b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
@@ -0,0 +1,3 @@
+require k3r5.conf
+
+MACHINE:append = "-hs-se"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 37d022e9..77709689 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
+SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [meta-ti] [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration
2023-03-20 3:37 ` [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration Denys Dmytriyenko
@ 2023-03-21 16:11 ` Ryan Eatmon
2023-03-21 19:10 ` Denys Dmytriyenko
0 siblings, 1 reply; 59+ messages in thread
From: Ryan Eatmon @ 2023-03-21 16:11 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-ti
On 3/19/2023 22:37, Denys Dmytriyenko wrote:
> From: Chirag Shilwant <c-shilwant@ti.com>
>
> Lets add the basic AM62Q HS-SE configuration.
> - Add configurations.
> - Add ti-sci-firmware overrides.
> - Add u-boot overrides.
> - Add optee overrides.
> - Add ti-rtos-firmware overrides.
>
> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> .../conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 14 ++++++++++++++
> meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 12 ++++++++++--
> meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 6 +++++-
> meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 16 ++++++++++++++++
> meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf | 3 +++
> .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 +
> 6 files changed, 49 insertions(+), 3 deletions(-)
> create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
> create mode 100644 meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
>
> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
> new file mode 100644
> index 00000000..11e70342
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
> @@ -0,0 +1,14 @@
> +#@TYPE: Machine
> +#@NAME: AM62xx LPSK HS-SE EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-SE EVM (R5F core)
> +
> +# Booting HS-SE requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY:append = ":k3r5-hs-se"
> +
> +SYSFW_SOC = "am62x"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "hs"
> +
> +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
> index ca4ced5a..15ecc677 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
> @@ -1,11 +1,19 @@
> #@TYPE: Machine
> -#@NAME: AM62XX LP EVM (R5F)
> -#@DESCRIPTION: Machine configuration for the TI AM62xx LP EVM (R5F core)
> +#@NAME: AM62XX LP GP EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
>
> require conf/machine/include/k3r5.inc
> +SOC_FAMILY:append = ":k3r5-gp"
>
> SYSFW_SOC = "am62x"
> SYSFW_CONFIG = "evm"
> SYSFW_SUFFIX = "gp"
>
> +SYSFW_TIBOOT3_SYMLINK = ""
> +
> UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
> +
> +SPL_BINARY = ""
> +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
> +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
> index ec9ce596..be95f33a 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
> @@ -2,7 +2,7 @@
> #@NAME: AM62XX LP EVM
> #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
>
> -require conf/machine/include/am62xx.inc
> +require conf/machine/include/am62xx-lp.inc
>
> KERNEL_DEVICETREE = " \
> ti/k3-am62x-lp-sk.dtb \
> @@ -11,4 +11,8 @@ KERNEL_DEVICETREE = " \
> ti/k3-am625-sk-csi2-ov5640.dtbo \
> "
>
> +SPL_BINARY = "tispl.bin_HS"
> +UBOOT_BINARY = "u-boot.img_HS"
> +UBOOT_SYMLINK = "u-boot.img"
> +
> UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> new file mode 100644
> index 00000000..df113003
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> @@ -0,0 +1,16 @@
> +require conf/machine/include/k3.inc
> +SOC_FAMILY:append = ":am62xx"
> +
> +MACHINE_FEATURES += "screen touchscreen"
> +
> +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> +
> +TFA_K3_SYSTEM_SUSPEND = "1"
> +
> +# Default tiboot3.bin on AM62x LP is for HS-SE
> +BBMULTICONFIG += "k3r5-hs-se"
> +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
> +
> +TFA_BOARD = "lite"
> +OPTEEMACHINE = "k3-am62x"
> diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
> new file mode 100644
> index 00000000..7e3d7dae
> --- /dev/null
> +++ b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf
> @@ -0,0 +1,3 @@
> +require k3r5.conf
> +
> +MACHINE:append = "-hs-se"
> diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> index 37d022e9..77709689 100644
> --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
> SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
> SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
> SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
> +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
Ooops. We missed a dunfell to kirkstone syntax change. No need to send
an updated patch, I will just do a git fixup and address it.
Thanks for your hard work on these patch sync ups, Denys. It is very
much appreciated.
> SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
>
> SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#16019): https://lists.yoctoproject.org/g/meta-ti/message/16019
> Mute This Topic: https://lists.yoctoproject.org/mt/97724610/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/10828724/6551054/1815494134/xyzzy [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [meta-ti] [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration
2023-03-21 16:11 ` [meta-ti] " Ryan Eatmon
@ 2023-03-21 19:10 ` Denys Dmytriyenko
2023-03-21 19:24 ` Jose Quaresma
0 siblings, 1 reply; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-21 19:10 UTC (permalink / raw)
To: Ryan Eatmon; +Cc: meta-ti
On Tue, Mar 21, 2023 at 11:11:26AM -0500, Ryan Eatmon wrote:
>
>
> On 3/19/2023 22:37, Denys Dmytriyenko wrote:
> >From: Chirag Shilwant <c-shilwant@ti.com>
> >
> >Lets add the basic AM62Q HS-SE configuration.
> >- Add configurations.
> >- Add ti-sci-firmware overrides.
> >- Add u-boot overrides.
> >- Add optee overrides.
> >- Add ti-rtos-firmware overrides.
> >
> >Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> >Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> >diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> >index 37d022e9..77709689 100644
> >--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> >+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> >@@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
> > SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
> > SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
> > SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
> >+SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
>
> Ooops. We missed a dunfell to kirkstone syntax change. No need to
> send an updated patch, I will just do a git fixup and address it.
Ah, nice catch! I guess I've had too many rebases... :)
Thanks for very careful reviewing!
> Thanks for your hard work on these patch sync ups, Denys. It is
> very much appreciated.
The issue is that kirkstone and master have diverged from dunfell too much now
and porting changes became heavily manual process and error-prone. Hopefull we
can close dunfell for any new features very soon.
--
Denys
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [meta-ti] [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration
2023-03-21 19:10 ` Denys Dmytriyenko
@ 2023-03-21 19:24 ` Jose Quaresma
2023-03-21 19:38 ` Denys Dmytriyenko
0 siblings, 1 reply; 59+ messages in thread
From: Jose Quaresma @ 2023-03-21 19:24 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Ryan Eatmon, meta-ti
[-- Attachment #1: Type: text/plain, Size: 2527 bytes --]
Denys Dmytriyenko <denis@denix.org> escreveu no dia terça, 21/03/2023 à(s)
19:11:
> On Tue, Mar 21, 2023 at 11:11:26AM -0500, Ryan Eatmon wrote:
> >
> >
> > On 3/19/2023 22:37, Denys Dmytriyenko wrote:
> > >From: Chirag Shilwant <c-shilwant@ti.com>
> > >
> > >Lets add the basic AM62Q HS-SE configuration.
> > >- Add configurations.
> > >- Add ti-sci-firmware overrides.
> > >- Add u-boot overrides.
> > >- Add optee overrides.
> > >- Add ti-rtos-firmware overrides.
> > >
> > >Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> > >Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> > >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> > >---
> > >diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> > >index 37d022e9..77709689 100644
> > >--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> > >+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> > >@@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
> > > SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
> > > SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
> > > SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
> > >+SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
> >
> > Ooops. We missed a dunfell to kirkstone syntax change. No need to
> > send an updated patch, I will just do a git fixup and address it.
>
> Ah, nice catch! I guess I've had too many rebases... :)
> Thanks for very careful reviewing!
>
>
> > Thanks for your hard work on these patch sync ups, Denys. It is
> > very much appreciated.
>
> The issue is that kirkstone and master have diverged from dunfell too much
> now
> and porting changes became heavily manual process and error-prone.
> Hopefull we
> can close dunfell for any new features very soon.
>
The dunfell branch supports the new bitbake syntax as well so another
solution to lower the divergence
can be mitigating the dunfelll branch to the new syntax, however doing that
won't be easy either.
Jose
>
> --
> Denys
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#16222):
> https://lists.yoctoproject.org/g/meta-ti/message/16222
> Mute This Topic: https://lists.yoctoproject.org/mt/97724610/5052612
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe:
> https://lists.yoctoproject.org/g/meta-ti/leave/11369865/5052612/926574700/xyzzy
> [quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
--
Best regards,
José Quaresma
[-- Attachment #2: Type: text/html, Size: 4440 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [meta-ti] [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration
2023-03-21 19:24 ` Jose Quaresma
@ 2023-03-21 19:38 ` Denys Dmytriyenko
0 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-21 19:38 UTC (permalink / raw)
To: Jose Quaresma; +Cc: Ryan Eatmon, meta-ti
On Tue, Mar 21, 2023 at 07:24:17PM +0000, Jose Quaresma wrote:
> Denys Dmytriyenko <denis@denix.org> escreveu no dia terça, 21/03/2023 à(s)
> 19:11:
>
> > On Tue, Mar 21, 2023 at 11:11:26AM -0500, Ryan Eatmon wrote:
> > >
> > >
> > > On 3/19/2023 22:37, Denys Dmytriyenko wrote:
> > > >From: Chirag Shilwant <c-shilwant@ti.com>
> > > >
> > > >Lets add the basic AM62Q HS-SE configuration.
> > > >- Add configurations.
> > > >- Add ti-sci-firmware overrides.
> > > >- Add u-boot overrides.
> > > >- Add optee overrides.
> > > >- Add ti-rtos-firmware overrides.
> > > >
> > > >Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> > > >Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> > > >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> > > >---
> > > >diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> > b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> > > >index 37d022e9..77709689 100644
> > > >--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> > > >+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> > > >@@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
> > > > SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
> > > > SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
> > > > SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
> > > >+SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
> > >
> > > Ooops. We missed a dunfell to kirkstone syntax change. No need to
> > > send an updated patch, I will just do a git fixup and address it.
> >
> > Ah, nice catch! I guess I've had too many rebases... :)
> > Thanks for very careful reviewing!
> >
> >
> > > Thanks for your hard work on these patch sync ups, Denys. It is
> > > very much appreciated.
> >
> > The issue is that kirkstone and master have diverged from dunfell too much
> > now
> > and porting changes became heavily manual process and error-prone.
> > Hopefull we
> > can close dunfell for any new features very soon.
> >
>
> The dunfell branch supports the new bitbake syntax as well so another
> solution to lower the divergence
> can be mitigating the dunfelll branch to the new syntax, however doing that
> won't be easy either.
This would be a major change globally across the layer in dunfell, akin to a
new feature. It would require re-testing everything all over again.
Also, it would provide very little benefit, since there were some major layer
restructuring and soc/platform configuration changes in meta-ti in kirkstone.
--
Denys
^ permalink raw reply [flat|nested] 59+ messages in thread
* [kirkstone][PATCH 12/54] hs: Deploy the unsigned versions of bl31 and bl32
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (10 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 11/54] machine: Add AM62Q HS-SE evm configuration Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:37 ` [kirkstone][PATCH 13/54] optee-os: Enable SW PRNG for OP-TEE in AM62X Denys Dmytriyenko
` (41 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Ryan Eatmon <reatmon@ti.com>
In addition to releasing the signed versions of the bl31.bin and
bl32.bin files, also release the unsigned original versions.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../trusted-firmware-a/trusted-firmware-a_%.bbappend | 12 ++++++++++++
.../recipes-security/optee/optee-os_3.16%.bbappend | 10 +++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index be601e62..60f0496c 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -17,3 +17,15 @@ do_compile:append:k3() {
mv ${BUILD_DIR}/bl31.bin ${BUILD_DIR}/bl31.bin.unsigned
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${BUILD_DIR}/bl31.bin.unsigned ${BUILD_DIR}/bl31.bin
}
+
+do_install:append:k3() {
+ if [ -f ${BUILD_DIR}/bl31.bin.unsigned ]; then
+ echo "Install bl31.bin.unsigned"
+ install -m 0644 ${BUILD_DIR}/bl31.bin.unsigned \
+ ${D}/firmware/bl31.bin.unsigned
+ else
+ echo "Install bl31.bin.unsigned"
+ install -m 0644 ${BUILD_DIR}/bl31.bin \
+ ${D}/firmware/bl31.bin.unsigned
+ fi
+}
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
index 2aa34530..7772c58e 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
@@ -9,13 +9,6 @@ EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') i
EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
-do_compile:append:k3() {
- ( cd ${B}/core/; \
- cp tee-pager_v2.bin ${B}/bl32.bin; \
- cp tee.elf ${B}/bl32.elf; \
- )
-}
-
# Signing procedure for legacy HS devices
optee_sign_legacyhs() {
( cd ${B}/core/; \
@@ -46,12 +39,14 @@ do_compile:append:dra7xx() {
# Signing procedure for K3 devices
do_compile:append:k3() {
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${B}/core/tee-pager_v2.bin ${B}/bl32.bin
+ cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin.unsigned
cp ${B}/core/tee.elf ${B}/bl32.elf
}
do_install:append:ti-soc() {
install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true
install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true
+ install -m 644 ${B}/bl32.bin.unsigned ${D}${nonarch_base_libdir}/firmware/ || true
install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true
}
@@ -72,6 +67,7 @@ do_deploy:append:dra7xx() {
do_deploy:append:k3() {
ln -sf optee/bl32.bin ${DEPLOYDIR}/
+ ln -sf optee/bl32.bin.unsigned ${DEPLOYDIR}/
ln -sf optee/bl32.elf ${DEPLOYDIR}/
}
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 13/54] optee-os: Enable SW PRNG for OP-TEE in AM62X
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (11 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 12/54] hs: Deploy the unsigned versions of bl31 and bl32 Denys Dmytriyenko
@ 2023-03-20 3:37 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 14/54] trusted-firmware-a: upgrade to v2.8+ Denys Dmytriyenko
` (40 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:37 UTC (permalink / raw)
To: meta-ti
From: Dhruva Gole <d-gole@ti.com>
commit 98506a4a07363 ("optee-os: Update SRCREV for OP-TEE TRNG in AM62X")
Disables SW PRNG => Enabling Hardware RNG. This is breaking Suspend Resume
on AM62xx EVM variants. To fix this keep using SOFTWARE_PRNG enabled as
it was.
Cc: vibhore@ti.com
Cc: Andrew Davis <afd@ti.com>
Signed-off-by: Dhruva Gole <d-gole@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
index 7772c58e..8fdf6513 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
@@ -6,7 +6,7 @@ inherit ti-secdev
EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
-EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
+EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
# Signing procedure for legacy HS devices
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 14/54] trusted-firmware-a: upgrade to v2.8+
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (12 preceding siblings ...)
2023-03-20 3:37 ` [kirkstone][PATCH 13/54] optee-os: Enable SW PRNG for OP-TEE in AM62X Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 15/54] k3conf update SRCREV to add am62ax support Denys Dmytriyenko
` (39 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Judith Mendez <jm@ti.com>
Upgrade arm-trusted-firmare to v2.8-226-g2fcd408bb.
This upgrade picks up K3 L2 cache, snoop delayed, and EA
handling updates from upstream master.
Do not update to tip of master due to PSCI system off
support breaking AM62x and AM62q platforms.
Signed-off-by: Judith Mendez <jm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
Tested-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 60f0496c..9b8dd142 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -1,5 +1,5 @@
-PV:k3 = "2.7"
-SRCREV_tfa:k3 = "1309c6c805190bd376c0561597653f3f8ecd0f58"
+PV:k3 = "2.8+git${SRCPV}"
+SRCREV_tfa:k3 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5"
SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
COMPATIBLE_MACHINE:k3 = "k3"
TFA_BUILD_TARGET:k3 = "all"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 15/54] k3conf update SRCREV to add am62ax support
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (13 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 14/54] trusted-firmware-a: upgrade to v2.8+ Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 16/54] machine: Add AM62x HS-SE evm configuration Denys Dmytriyenko
` (38 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Bryan Brattlof <bb@ti.com>
update the SHA of k3conf to pickup am62ax support
Signed-off-by: Bryan Brattlof <bb@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
index 10e2631e..c6d3773e 100644
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -8,7 +8,7 @@ PV = "0.2+git${SRCPV}"
COMPATIBLE_MACHINE = "k3"
BRANCH ?= "master"
-SRCREV = "48cb8e8d7dc962229a9f318cd512b4ddeec5cdc5"
+SRCREV = "982f5c2f02f732b5829861218812904cd776773d"
SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 16/54] machine: Add AM62x HS-SE evm configuration
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (14 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 15/54] k3conf update SRCREV to add am62ax support Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 17/54] optee: update optee components to 3.20 tag Denys Dmytriyenko
` (37 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Chirag Shilwant <c-shilwant@ti.com>
Lets add the basic AM62x HS-SE configuration.
- Add machine conf for AM62x HS-SE.
- The wic images will boot on AM62x GP devices by default.
- To boot on AM62x HS-SE, simply switch out the SYSFW image:
$ cd /mnt/sd-card/boot
$ mv tiboot3-am62x-hs-evm.bin tiboot3.bin
- Add ti-sci-firmware overrides.
- Add support to sign ATF and OPTEE.
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
...-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} | 3 +++
.../conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 +++++++++++++++++++
meta-ti-bsp/conf/machine/am62xx-evm.conf | 4 ++++
meta-ti-bsp/conf/machine/include/am62xx.inc | 8 +++++++
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
5 files changed, 38 insertions(+), 1 deletion(-)
rename meta-ti-bsp/conf/machine/{am62xx-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} (67%)
create mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
similarity index 67%
rename from meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
rename to meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
index 724a8d4a..d9867bc7 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
@@ -9,3 +9,6 @@ SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf
new file mode 100644
index 00000000..7bca513a
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: AM62xx HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F core)
+
+# Booting HS-SE requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-hs-se"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index 73859d5f..96355411 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -12,3 +12,7 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 98df24b2..53e48610 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -8,6 +8,14 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+BBMULTICONFIG = "k3r5-gp"
+do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62x is for GP, add a version for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+
TFA_BOARD = "lite"
TFA_K3_SYSTEM_SUSPEND = "1"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 77709689..798131d4 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -37,7 +37,8 @@ SYSFW_PREFIX:j721s2-evm-k3r5 = "fs"
SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
+SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs"
+SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 17/54] optee: update optee components to 3.20 tag
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (15 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 16/54] machine: Add AM62x HS-SE evm configuration Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 18/54] optee: fix the sha for " Denys Dmytriyenko
` (36 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Manorit Chawdhry <m-chawdhry@ti.com>
OPTEE tests is not being upgraded due to a newer python dependency for
the build
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../recipes-security/optee/optee-client_3.16%.bbappend | 9 ++++++---
.../recipes-security/optee/optee-examples_%.bbappend | 5 +++--
.../recipes-security/optee/optee-os_3.16%.bbappend | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend
index 61760b8e..19db3827 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend
@@ -1,4 +1,7 @@
-PV:ti-soc = "3.19.0+git${SRCPV}"
-SRCREV:ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951"
+PV:ti-soc = "3.20.0+git${SRCPV}"
+SRCREV:ti-soc = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc"
-DEPENDS:append:ti-soc = "pkgconfig util-linux"
+inherit pkgconfig
+DEPENDS:append:ti-soc = " util-linux"
+
+EXTRA_OEMAKE:append:ti-soc = " PKG_CONFIG=pkg-config"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
index 9c757f11..1760a6fa 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
@@ -1,2 +1,3 @@
-PV:ti-soc = "3.19.0+git${SRCPV}"
-SRCREV:ti-soc = "f301ee9df2129c0db683e726c91dc2cefe4cdb65"
+PV:ti-soc = "3.20.0+git${SRCPV}"
+SRCREV:ti-soc = "a98d01e1b9168eaed96bcd0bac0df67c44a81081"
+SRC_URI = "git://github.com/linaro-swg/optee_examples.git;branch=master;protocol=https"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
index 8fdf6513..b29553d6 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
@@ -1,5 +1,5 @@
-PV:ti-soc = "3.19.0+git${SRCPV}"
-SRCREV:ti-soc = "d6c5d0037b46f46caf71d67d7825d4b722cbcddf"
+PV:ti-soc = "3.20.0+git${SRCPV}"
+SRCREV:ti-soc = "3bc3809afe372ca7e8216fc5d7a64e965bb4ad70"
# Use TI SECDEV for signing
inherit ti-secdev
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 18/54] optee: fix the sha for 3.20 tag
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (16 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 17/54] optee: update optee components to 3.20 tag Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 19/54] optee-os-tadevkit: update to match optee-os Denys Dmytriyenko
` (35 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Manorit Chawdhry <m-chawdhry@ti.com>
The SHA for optee_os had been of 3.20-rc1 tag instead of 3.20 tag which
had been marked stable. Change the tag to 3.20.
Fixes: 280e7b4b3a17 ("optee: update optee components to 3.20 tag")
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
index b29553d6..a3fef348 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend
@@ -1,5 +1,5 @@
PV:ti-soc = "3.20.0+git${SRCPV}"
-SRCREV:ti-soc = "3bc3809afe372ca7e8216fc5d7a64e965bb4ad70"
+SRCREV:ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94"
# Use TI SECDEV for signing
inherit ti-secdev
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 19/54] optee-os-tadevkit: update to match optee-os
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (17 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 18/54] optee: fix the sha for " Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 20/54] conf: machine: k3: Define RD, DTB and DTBO load address for FIT image Denys Dmytriyenko
` (34 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Denys Dmytriyenko <denys@konsulko.com>
This installs shared OPTEE-OS APIs and needs to match in order for latest
client/test/examples to be able to build.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../recipes-security/optee/optee-os-tadevkit_%.bbappend | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
index 4300c1a9..7109c342 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
@@ -1,2 +1,2 @@
-PV:ti-soc = "3.17.0+git${SRCPV}"
-SRCREV:ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca"
+PV:ti-soc = "3.20.0+git${SRCPV}"
+SRCREV:ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 20/54] conf: machine: k3: Define RD, DTB and DTBO load address for FIT image
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (18 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 19/54] optee-os-tadevkit: update to match optee-os Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 21/54] am62xx-evm: Add AM62x HS-FS evm configuration Denys Dmytriyenko
` (33 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Sinthu Raja <sinthu.raja@ti.com>
K3 platforms include the FIT image-based kernel by default. The bootloader
loads the kernel and DTB from the FIT image. The DTB/DTBOs are added to the
FIT image but the load address is not included in the image section of
each DTB/DTBO. This load address is determined by the LOADADDRESS macros
in the kernel-fitmage class.
Hence, define the RD/DTB/DTBOs LOADADDRESS and OFFSET macros in the K3 common
include, and remove those macros defined in the K3 board specific config files.
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Reviewed-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 8 --------
meta-ti-bsp/conf/machine/include/k3.inc | 5 +++++
meta-ti-bsp/conf/machine/j7200-hs-evm.conf | 8 --------
meta-ti-bsp/conf/machine/j721e-hs-evm.conf | 8 --------
meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 8 --------
5 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
index ea1f8ff1..2c1256d0 100644
--- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
@@ -6,14 +6,6 @@ require conf/machine/include/am65xx.inc
UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
-UBOOT_ENTRYPOINT = "0x80080000"
-UBOOT_LOADADDRESS = "0x80080000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET = "0x00010000"
-
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index e4ef2f94..93bcea76 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -21,6 +21,11 @@ KERNEL_CLASSES += "kernel-fitimage"
UBOOT_ARCH = "arm"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+UBOOT_DTB_LOADADDRESS = "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83080000"
+UBOOT_DTBO_OFFSET = "0x00010000"
SPL_BINARY = "tispl.bin"
SPL_BINARYNAME = "tispl.bin"
diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
index ef7268b1..dc928974 100644
--- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
@@ -6,14 +6,6 @@ require conf/machine/j7200-evm.conf
UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig"
-UBOOT_ENTRYPOINT = "0x80080000"
-UBOOT_LOADADDRESS = "0x80080000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET = "0x00010000"
-
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
index acd5ca18..00ec1998 100644
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
@@ -6,14 +6,6 @@ require conf/machine/j721e-evm.conf
UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig"
-UBOOT_ENTRYPOINT = "0x80080000"
-UBOOT_LOADADDRESS = "0x80080000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET = "0x00010000"
-
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 84db90bb..3d737f44 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -6,14 +6,6 @@ require conf/machine/j721s2-evm.conf
UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
-UBOOT_ENTRYPOINT = "0x80080000"
-UBOOT_LOADADDRESS = "0x80080000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET = "0x00010000"
-
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 21/54] am62xx-evm: Add AM62x HS-FS evm configuration
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (19 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 20/54] conf: machine: k3: Define RD, DTB and DTBO load address for FIT image Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 22/54] am62xx-lp-evm: Add AM62x LP " Denys Dmytriyenko
` (32 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Chirag Shilwant <c-shilwant@ti.com>
Lets add the basic AM62x HS-FS configuration
- Add machine conf for AM62x HS-FS.
- The wic images will boot on AM62x HS-FS devices by default.
- The sysfw image for GP and HS-SE will be packaged in the wic image as
tiboot3-am62x-gp-evm.bin and tiboot3-am62x-hs-evm.bin respectively.
- Add ti-sci-firmware overrides.
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf | 4 ++++
.../conf/machine/am62xx-evm-k3r5-hs-fs.conf | 14 ++++++++++++++
meta-ti-bsp/conf/machine/include/am62xx.inc | 12 +++++++++---
meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf | 3 +++
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 +
5 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf
create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
index d9867bc7..ab18301a 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf
@@ -8,7 +8,11 @@ SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = ""
+
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+SPL_BINARY = ""
UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf
new file mode 100644
index 00000000..0dad1104
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62xx HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-hs-fs"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 53e48610..af6a6db4 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -8,10 +8,16 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-BBMULTICONFIG = "k3r5-gp"
-do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+# Default tiboot3.bin on AM62x is for HS-FS
+BBMULTICONFIG = "k3r5-hs-fs"
+do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
-# Since default tiboot3.bin on AM62x is for GP, add a version for HS-SE
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
+BBMULTICONFIG += "k3r5-gp"
+IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
BBMULTICONFIG += "k3r5-hs-se"
IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf
new file mode 100644
index 00000000..e22204ee
--- /dev/null
+++ b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf
@@ -0,0 +1,3 @@
+require k3r5.conf
+
+MACHINE:append = "-hs-fs"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 798131d4..8004c227 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs"
+SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 22/54] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (20 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 21/54] am62xx-evm: Add AM62x HS-FS evm configuration Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 23/54] ti-sci-fw: Add SYSFW_SUFFIX to sysfw.itb files Denys Dmytriyenko
` (31 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Chirag Shilwant <c-shilwant@ti.com>
Lets add the basic AM62x LP HS-FS configuration
- Add machine conf for AM62x LP HS-FS.
- The wic images will boot on AM62x LP HS-FS devices by default.
- The sysfw image for HS-SE will be packaged in the wic image as
tiboot3-am62x-hs-evm.bin.
- Add ti-sci-firmware overrides.
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf | 14 ++++++++++++++
.../conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 7 +++++++
meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 7 ++++++-
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 +
4 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
new file mode 100644
index 00000000..9026b67c
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62xx LPSK HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-hs-fs"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
index 11e70342..c126de0f 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
@@ -11,4 +11,11 @@ SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs"
+SYSFW_TIBOOT3_SYMLINK = ""
+
UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
index df113003..d37d4673 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
@@ -8,8 +8,13 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_SYSTEM_SUSPEND = "1"
-# Default tiboot3.bin on AM62x LP is for HS-SE
+# Default tiboot3.bin on AM62x LP is for HS-FS
+BBMULTICONFIG = "k3r5-hs-fs"
+do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE
BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
TFA_BOARD = "lite"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 8004c227..75b9f8a6 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -42,6 +42,7 @@ SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
+SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs"
SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 23/54] ti-sci-fw: Add SYSFW_SUFFIX to sysfw.itb files
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (21 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 22/54] am62xx-lp-evm: Add AM62x LP " Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 24/54] conf: machine: j721s2-evm: Add support for J721S2 HS-FS Denys Dmytriyenko
` (30 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Ryan Eatmon <reatmon@ti.com>
With the advent of using multiconfigs to build all of the versions of
the machines (gp, hs-se, hs-fs, etc...) the sysfw.itb has become a point
of contention for do_deploy. To resolve the duplicate file copy errors
from bitbake we need to uniquify the sysfw.itb file names. So, let's do
the same thing we do with the tiboot3.bin file and add the SYSFW_SUFFIX
into the name.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 20 +++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 75b9f8a6..b65d8502 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -51,10 +51,26 @@ SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin"
SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin"
SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
SYSFW_SYMLINK ?= "sysfw.itb"
+SYSFW_VBINARY:am65xx-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY:am65xx-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY:am65xx-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY:am65xx-hs-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY:j721e-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY:j721e-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+
+SYSFW_IMAGE:am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE:am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE:am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE:am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE:j721e-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE:j721e-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+
CFLAGS[unexport] = "1"
LDFLAGS[unexport] = "1"
AS[unexport] = "1"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 24/54] conf: machine: j721s2-evm: Add support for J721S2 HS-FS
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (22 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 23/54] ti-sci-fw: Add SYSFW_SUFFIX to sysfw.itb files Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 25/54] am62axx-evm: Add AM62A HS-FS evm configuration Denys Dmytriyenko
` (29 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Sinthu Raja <sinthu.raja@ti.com>
Add the basic J721S2 HS-FS configuration.
- Add configurations to support both HS-FS and GP keeping GP
as default.
- Add ti-sci-firmware overrides for HS-FS.
- Remove evm conf file inclusion in hs-evm conf.
- Add j721s2 hs-evm specific config to hs-evm conf.
Signed-off-by: Aniket Limaye <a-limaye@ti.com>
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../conf/machine/j721s2-evm-k3r5-gp.conf | 20 +++++++++++++++++++
.../machine/j721s2-evm-k3r5-sr1-hs-fs.conf | 15 ++++++++++++++
meta-ti-bsp/conf/machine/j721s2-evm.conf | 9 +++++++++
meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 15 +++++++++++++-
.../conf/multiconfig/k3r5-sr1-hs-fs.conf | 3 +++
meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf | 3 +++
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
7 files changed, 66 insertions(+), 2 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
create mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
new file mode 100644
index 00000000..95771139
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: J721S2 GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core)
+
+# Booting GP requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-gp"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
new file mode 100644
index 00000000..1a77830d
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: J721S2 HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-sr1-hs-fs"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 3576414d..93efbb70 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -15,3 +15,12 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
+
+# Default tiboot3.bin on J721S2 is for GP
+BBMULTICONFIG = "k3r5-gp"
+do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
+BBMULTICONFIG += "k3r5-sr1-hs-fs"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 3d737f44..8fa98440 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -2,10 +2,23 @@
#@NAME: J721S2 HS EVM
#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
-require conf/machine/j721s2-evm.conf
+require conf/machine/include/j721s2.inc
+
+SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE = " \
+ ti/k3-j721s2-common-proc-board.dtb \
+ ti/k3-j721s2-gesi-exp-board.dtbo \
+"
UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
new file mode 100644
index 00000000..505f08d5
--- /dev/null
+++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf
@@ -0,0 +1,3 @@
+require k3r5-sr1.conf
+
+MACHINE:append = "-hs-fs"
diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
new file mode 100644
index 00000000..1c8098cd
--- /dev/null
+++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf
@@ -0,0 +1,3 @@
+require k3r5.conf
+
+MACHINE:append = "-sr1"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index b65d8502..18153d37 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -33,7 +33,8 @@ SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs"
SYSFW_PREFIX:beaglebone-ai64-k3r5 = "fs"
SYSFW_PREFIX:j7200-evm-k3r5 = "fs"
SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX:j721s2-evm-k3r5 = "fs"
+SYSFW_PREFIX:j721s2-evm-k3r5-gp = "fs"
+SYSFW_PREFIX:j721s2-evm-k3r5-sr1-hs-fs = "fs"
SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 25/54] am62axx-evm: Add AM62A HS-FS evm configuration
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (23 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 24/54] conf: machine: j721s2-evm: Add support for J721S2 HS-FS Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 26/54] conf: machine: j784s4-evm: Add support for J784S4 HS-FS Denys Dmytriyenko
` (28 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Sai Sree Kartheek Adivi <s-adivi@ti.com>
Lets add the basic AM62A configuration
- Add machine conf for AM62A.
- The wic images will boot on AM62A HS-FS devices by default.
- The sysfw image for GP and HS-SE will be packaged in the wic image as
tiboot3-am62ax-gp-evm.bin and tiboot3-am62ax-hs-evm.bin respectively.
- Add ti-sci-firmware overrides.
- Sign ATF, OPTEE and RTOS Firmware.
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../conf/machine/am62axx-evm-k3r5-gp.conf | 19 ++++++++++++++++
.../conf/machine/am62axx-evm-k3r5-hs-fs.conf | 14 ++++++++++++
.../conf/machine/am62axx-evm-k3r5-hs-se.conf | 22 +++++++++++++++++++
.../conf/machine/am62axx-evm-k3r5.conf | 11 ----------
meta-ti-bsp/conf/machine/am62axx-evm.conf | 4 ++++
meta-ti-bsp/conf/machine/include/am62axx.inc | 15 +++++++++++--
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 +++-
7 files changed, 75 insertions(+), 14 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf
create mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf
create mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf
delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf
new file mode 100644
index 00000000..962413c3
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: AM62A GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+SYSFW_SYMLINK = ""
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf
new file mode 100644
index 00000000..256f021a
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62A HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-hs-fs"
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf
new file mode 100644
index 00000000..c7cb0681
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: AM62A HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core)
+
+# Booting HS-SE requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-hs-se"
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+SYSFW_SYMLINK = ""
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
deleted file mode 100644
index ca30537f..00000000
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62AXX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index 4eb179f3..5e11d19b 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -9,3 +9,7 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
index cc477366..d0970948 100644
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -8,8 +8,19 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_SYSTEM_SUSPEND = "1"
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+# Default tiboot3.bin on AM62A is for HS-FS
+BBMULTICONFIG = "k3r5-hs-fs"
+do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
+BBMULTICONFIG += "k3r5-gp"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
TFA_BOARD = "lite"
OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 18153d37..5fb16642 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -44,7 +44,9 @@ SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs"
SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs"
SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs"
-SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"
+SYSFW_PREFIX:am62axx-evm-k3r5-gp = "fs"
+SYSFW_PREFIX:am62axx-evm-k3r5-hs-fs = "fs"
+SYSFW_PREFIX:am62axx-evm-k3r5-hs-se = "fs"
SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 26/54] conf: machine: j784s4-evm: Add support for J784S4 HS-FS
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (24 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 25/54] am62axx-evm: Add AM62A HS-FS evm configuration Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 27/54] conf: machine: am62xx: Add missing overlays for AM625 SK Denys Dmytriyenko
` (27 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Dasnavis <sabiya.d@ti.com>
Add the basic J784S4 HS-FS configuration.
* Add configurations to support both HS-FS and GP keeping GP as default.
* Add ti-sci-firmware overrides for HS-FS.
* Remove evm conf file inclusion in hs-evm conf.
* Add j784s4 hs-evm specific config to hs-evm conf.
Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../conf/machine/j784s4-evm-k3r5-gp.conf | 20 +++++++++++++++++++
.../machine/j784s4-evm-k3r5-sr1-hs-fs.conf | 16 +++++++++++++++
meta-ti-bsp/conf/machine/j784s4-evm.conf | 9 +++++++++
meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 16 ++++++++++++++-
.../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
5 files changed, 62 insertions(+), 2 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf
create mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf
new file mode 100644
index 00000000..6f7ef92e
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: J784S4 GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J784S4 GP EVM (R5F core)
+
+# Booting GP requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-gp"
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
+
+UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
new file mode 100644
index 00000000..18b38305
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: J784S4 HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J784S4 HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY:append = ":k3r5-sr1-hs-fs"
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+SYSFW_TIBOOT3_SYMLINK = ""
+SYSFW_SYMLINK = ""
+
+UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 73f3eb8c..4e0bfba6 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -14,3 +14,12 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
+
+# Default tiboot3.bin on J784S4 is for GP
+BBMULTICONFIG = "k3r5-gp"
+do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
+BBMULTICONFIG += "k3r5-sr1-hs-fs"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
index 62357d62..1c56f55a 100644
--- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
@@ -2,10 +2,24 @@
#@NAME: J784S4 HS EVM
#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM
-require conf/machine/j784s4-evm.conf
+require conf/machine/include/j784s4.inc
+
+SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+TFA_K3_USART = "0x8"
+OPTEEMACHINE = "k3-j784s4"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE = " \
+ ti/k3-j784s4-evm.dtb \
+"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+
+TFA_BOARD = "j784s4"
+
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
UBOOT_SYMLINK = "u-boot.img"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 5fb16642..4fcda026 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -36,7 +36,8 @@ SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:j721s2-evm-k3r5-gp = "fs"
SYSFW_PREFIX:j721s2-evm-k3r5-sr1-hs-fs = "fs"
SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX:j784s4-evm-k3r5 = "fs"
+SYSFW_PREFIX:j784s4-evm-k3r5-gp = "fs"
+SYSFW_PREFIX:j784s4-evm-k3r5-sr1-hs-fs = "fs"
SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs"
SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 27/54] conf: machine: am62xx: Add missing overlays for AM625 SK
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (25 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 26/54] conf: machine: j784s4-evm: Add support for J784S4 HS-FS Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 28/54] conf: machine: am62axx: Add camera overlays for AM62A SK Denys Dmytriyenko
` (26 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Aradhya Bhatia <a-bhatia1@ti.com>
Add the overlay files, over AM625 SK, for the following:
1. Technexion OV5640 Camera
2. Enhanced Capture (ECAP)
3. HDMI Audio Output
4. MCAN Transceiver
5. Microtips OLDI Panel
Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am62xx-evm.conf | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index 96355411..8892a05f 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -9,6 +9,11 @@ KERNEL_DEVICETREE = " \
ti/k3-am625-skeleton.dtb \
ti/k3-am625-sk-lpmdemo.dtb \
ti/k3-am625-sk-csi2-ov5640.dtbo \
+ ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \
+ ti/k3-am625-sk-ecap-capture.dtbo \
+ ti/k3-am625-sk-hdmi-audio.dtbo \
+ ti/k3-am625-sk-mcan.dtbo \
+ ti/k3-am625-sk-oldi-panel.dtbo \
"
UBOOT_MACHINE = "am62x_evm_a53_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 28/54] conf: machine: am62axx: Add camera overlays for AM62A SK
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (26 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 27/54] conf: machine: am62xx: Add missing overlays for AM625 SK Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 29/54] conf: machine: j721s2: Add AM68 SK specific dtb and dtbo to KERNEL_DEVICETREE Denys Dmytriyenko
` (25 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Jai Luthra <j-luthra@ti.com>
Add the following overlay files on AM62A SK:
1. Fusion board (For FPDLink-III cameras)
2. OV2312 FPDLink camera module
3. IMX219 RPi-compatible camera module
Signed-off-by: Jai Luthra <j-luthra@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am62axx-evm.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index 5e11d19b..12492095 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -6,6 +6,12 @@ require conf/machine/include/am62axx.inc
KERNEL_DEVICETREE = " \
ti/k3-am62a7-sk.dtb \
+ ti/k3-am62a7-fpdlink-ov2312-0-0.dtbo \
+ ti/k3-am62a7-fpdlink-ov2312-0-1.dtbo \
+ ti/k3-am62a7-fpdlink-ov2312-0-2.dtbo \
+ ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \
+ ti/k3-am62a7-fpdlink-sk-fusion.dtbo \
+ ti/k3-am62a7-sk-csi2-imx219.dtbo \
"
UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 29/54] conf: machine: j721s2: Add AM68 SK specific dtb and dtbo to KERNEL_DEVICETREE
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (27 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 28/54] conf: machine: am62axx: Add camera overlays for AM62A SK Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 30/54] conf: machine: am62axx: Add overlays for IMX390 cameras Denys Dmytriyenko
` (24 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Sinthu Raja <sinthu.raja@ti.com>
AM68 Starter Kit is a low cost, small form factor board designed for
TI's AM68/J721S2 SoC[1] which is optimized to provide best in class performance
for industrial applications. Add DTB entry for the same.
AM68 SK features camera support with MIPI(OV5640) and RPi(IMX219) connectors.
Add DTBO for the same. Also, add DTBO entry for the DDR memory carveout.
[1]:http://www.ti.com/lit/zip/spruj28
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 93efbb70..e3e52b49 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -10,6 +10,10 @@ TFA_K3_USART = "0x8"
OPTEE_K3_USART = "0x8"
KERNEL_DEVICETREE = " \
+ ti/k3-am68-sk-base-board.dtb \
+ ti/k3-am68-sk-bb-csi2-ov5640.dtb \
+ ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \
+ ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \
ti/k3-j721s2-common-proc-board.dtb \
ti/k3-j721s2-gesi-exp-board.dtbo \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 30/54] conf: machine: am62axx: Add overlays for IMX390 cameras
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (28 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 29/54] conf: machine: j721s2: Add AM68 SK specific dtb and dtbo to KERNEL_DEVICETREE Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 31/54] conf: machine: j784s4: Add AM69 SK specific dtb and dtbo to KERNEL_DEVICETREE Denys Dmytriyenko
` (23 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Jai Luthra <j-luthra@ti.com>
IMX390 is a 2MP FPDLink-III raw camera. This sensor was originally
targeted for J7-based devices, but AM62A can re-use the existing
overlays. Both the CM and RCM type of modules are supported.
As AM62A only has one CSI-RX port, we only use 4 out of the 8 total
FPDLink ports on the fusion board.
Signed-off-by: Jai Luthra <j-luthra@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am62axx-evm.conf | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index 12492095..9dcb6e55 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -12,6 +12,14 @@ KERNEL_DEVICETREE = " \
ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \
ti/k3-am62a7-fpdlink-sk-fusion.dtbo \
ti/k3-am62a7-sk-csi2-imx219.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
"
UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 31/54] conf: machine: j784s4: Add AM69 SK specific dtb and dtbo to KERNEL_DEVICETREE
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (29 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 30/54] conf: machine: am62axx: Add overlays for IMX390 cameras Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 32/54] conf: machine: j721s2: Fix DTB overlay extension for OV5640 Denys Dmytriyenko
` (22 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Dasnavis Sabiya <sabiya.d@ti.com>
AM69 Starter Kit is a single board designed based on TI's AM69 SOC
providing advanced system integration in automotive ADAS applications,
autonomous mobile robot and edge AI applications. Add support
for the same to include the board dtb file into the root filesystem.
Add DT overlays support for the following features on AM69 SK:
* Add DTBO entry to support OV5640 camera
* Add DTBO entry to support RPi(IMX219) camera
* Add DTBO entry for the DDR memory carveout.
[1]:https://www.ti.com/lit/zip/spruj52
Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j784s4-evm.conf | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 4e0bfba6..75ab484c 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -10,6 +10,10 @@ TFA_K3_USART = "0x8"
OPTEE_K3_USART = "0x8"
KERNEL_DEVICETREE = " \
+ ti/k3-am69-sk.dtb \
+ ti/k3-am69-sk-csi2-ov5640.dtbo \
+ ti/k3-am69-sk-ddr-mem-carveout.dtbo \
+ ti/k3-am69-sk-rpi-cam-imx219.dtbo \
ti/k3-j784s4-evm.dtb \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 32/54] conf: machine: j721s2: Fix DTB overlay extension for OV5640
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (30 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 31/54] conf: machine: j784s4: Add AM69 SK specific dtb and dtbo to KERNEL_DEVICETREE Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 33/54] conf: machine: j721s2: Add FPDLink overlays for am68-sk Denys Dmytriyenko
` (21 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Sinthu Raja <sinthu.raja@ti.com>
The extension for OV5640 overlay is incorrect. Therefore, update the
correct extension to build the overlay with .dtbo
Fixes: f67e9805 ("conf: machine: j721s2: Add AM68 SK specific dtb and dtbo to KERNEL_DEVICETREE")
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index e3e52b49..7fb00f35 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -11,7 +11,7 @@ OPTEE_K3_USART = "0x8"
KERNEL_DEVICETREE = " \
ti/k3-am68-sk-base-board.dtb \
- ti/k3-am68-sk-bb-csi2-ov5640.dtb \
+ ti/k3-am68-sk-bb-csi2-ov5640.dtbo \
ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \
ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \
ti/k3-j721s2-common-proc-board.dtb \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 33/54] conf: machine: j721s2: Add FPDLink overlays for am68-sk
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (31 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 32/54] conf: machine: j721s2: Fix DTB overlay extension for OV5640 Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 34/54] conf: machine: j784s4: Add FPDLink overlays for AM69 SK Denys Dmytriyenko
` (20 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Sinthu Raja <sinthu.raja@ti.com>
Add the overlay files, over AM68 SK, for the following:
1. Fusion board (For FPDLink-III cameras).
2. IMX390 FPDLink-III camera module which includes both the CM and
RCM type of modules.
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 7fb00f35..791ccbbc 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -13,7 +13,24 @@ KERNEL_DEVICETREE = " \
ti/k3-am68-sk-base-board.dtb \
ti/k3-am68-sk-bb-csi2-ov5640.dtbo \
ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \
+ ti/k3-am68-sk-fpdlink-fusion.dtbo \
ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
ti/k3-j721s2-common-proc-board.dtb \
ti/k3-j721s2-gesi-exp-board.dtbo \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 34/54] conf: machine: j784s4: Add FPDLink overlays for AM69 SK
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (32 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 33/54] conf: machine: j721s2: Add FPDLink overlays for am68-sk Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 35/54] conf: machine: j721s2: Add ehrpwm overlay for am68-sk Denys Dmytriyenko
` (19 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Dasnavis Sabiya <sabiya.d@ti.com>
Add the overlay files for AM69 SK:
1. Fusion board (For FPDLink-III cameras).
2. IMX390 FPDLink-III camera module that includes both the CM and
RCM type of modules.
Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j784s4-evm.conf | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 75ab484c..2180df29 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -13,7 +13,24 @@ KERNEL_DEVICETREE = " \
ti/k3-am69-sk.dtb \
ti/k3-am69-sk-csi2-ov5640.dtbo \
ti/k3-am69-sk-ddr-mem-carveout.dtbo \
+ ti/k3-am69-sk-fpdlink-fusion.dtbo \
ti/k3-am69-sk-rpi-cam-imx219.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
ti/k3-j784s4-evm.dtb \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 35/54] conf: machine: j721s2: Add ehrpwm overlay for am68-sk
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (33 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 34/54] conf: machine: j784s4: Add FPDLink overlays for AM69 SK Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 36/54] conf: machine: am62xx-lp-evm: Add OLDI Panel overlay Denys Dmytriyenko
` (18 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Sinthu Raja <sinthu.raja@ti.com>
The AM68 SK has PWM output pins connected to its RPi headers. Add
overlay file to enable PWM pins.
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 791ccbbc..ea727bd3 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -14,6 +14,7 @@ KERNEL_DEVICETREE = " \
ti/k3-am68-sk-bb-csi2-ov5640.dtbo \
ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \
ti/k3-am68-sk-fpdlink-fusion.dtbo \
+ ti/k3-am68-sk-rpi-hdr-ehrpwm.dtbo \
ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \
ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 36/54] conf: machine: am62xx-lp-evm: Add OLDI Panel overlay
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (34 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 35/54] conf: machine: j721s2: Add ehrpwm overlay for am68-sk Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 37/54] conf: machine: j784s4: Add ehrpwm overlay for am69-sk Denys Dmytriyenko
` (17 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Aradhya Bhatia <a-bhatia1@ti.com>
Add the Microtips OLDI Panel DT overlay for AM62 LP SK.
Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index be95f33a..cba05c4b 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -9,6 +9,7 @@ KERNEL_DEVICETREE = " \
ti/k3-am625-skeleton.dtb \
ti/k3-am625-sk-lpmdemo.dtb \
ti/k3-am625-sk-csi2-ov5640.dtbo \
+ ti/k3-am62x-lp-sk-oldi-panel.dtbo \
"
SPL_BINARY = "tispl.bin_HS"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 37/54] conf: machine: j784s4: Add ehrpwm overlay for am69-sk
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (35 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 36/54] conf: machine: am62xx-lp-evm: Add OLDI Panel overlay Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 38/54] conf: machine: j7200-evm: Add MCSPI loopback overlay for J7200 Denys Dmytriyenko
` (16 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Dasnavis Sabiya <sabiya.d@ti.com>
The AM69 SK has PWM output pins connected to its RPi header. Add
overlay file to enable PWM pins.
Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j784s4-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 2180df29..40e71b6a 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -14,6 +14,7 @@ KERNEL_DEVICETREE = " \
ti/k3-am69-sk-csi2-ov5640.dtbo \
ti/k3-am69-sk-ddr-mem-carveout.dtbo \
ti/k3-am69-sk-fpdlink-fusion.dtbo \
+ ti/k3-am69-sk-rpi-hdr-ehrpwm.dtbo \
ti/k3-am69-sk-rpi-cam-imx219.dtbo \
ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 38/54] conf: machine: j7200-evm: Add MCSPI loopback overlay for J7200
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (36 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 37/54] conf: machine: j784s4: Add ehrpwm overlay for am69-sk Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 39/54] conf: machine: j721e-evm: Add camera overlays for J721E EVM Denys Dmytriyenko
` (15 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Vaishnav Achath <vaishnav.a@ti.com>
Add the MCSPI loopback overlay file for J7200 EVM which helps
users to enable MCU-MAIN MCSPI loopback applications.
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j7200-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
index 33c39a52..e52d6371 100644
--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -9,6 +9,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
KERNEL_DEVICETREE = " \
ti/k3-j7200-common-proc-board.dtb \
+ ti/k3-j7200-mcspi-loopback.dtbo \
"
UBOOT_MACHINE = "j7200_evm_a72_config"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 39/54] conf: machine: j721e-evm: Add camera overlays for J721E EVM
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (37 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 38/54] conf: machine: j7200-evm: Add MCSPI loopback overlay for J7200 Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 40/54] conf: machine: j721s2-evm: Add camera overlays for J721S2 EVM Denys Dmytriyenko
` (14 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Vaishnav Achath <vaishnav.a@ti.com>
Add the following overlay files on J721E EVM:
1. Fusion board (For FPDLink-III cameras)
2. IMX390 FPDLink camera module
3. IMX219 RPi-compatible camera module
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721e-evm.conf | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
index fe28e6f5..aa966263 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -10,7 +10,28 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
KERNEL_DEVICETREE = " \
ti/k3-j721e-common-proc-board.dtb \
ti/k3-j721e-common-proc-board-infotainment.dtbo \
+ ti/k3-j721e-cpb-csi2-ov5640.dtbo \
+ ti/k3-j721e-fpdlink-cpb-fusion.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
+ ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
ti/k3-j721e-sk.dtb \
+ ti/k3-j721e-fpdlink-sk-fusion.dtbo \
+ ti/k3-j721e-sk-csi2-ov5640.dtbo \
+ ti/k3-j721e-sk-rpi-cam-imx219.dtbo \
"
UBOOT_MACHINE = "j721e_evm_a72_config"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 40/54] conf: machine: j721s2-evm: Add camera overlays for J721S2 EVM
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (38 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 39/54] conf: machine: j721e-evm: Add camera overlays for J721E EVM Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 41/54] conf: machine: j784s4-evm: Add camera overlays for J784S4 EVM Denys Dmytriyenko
` (13 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Vaishnav Achath <vaishnav.a@ti.com>
Add the following overlay files on J721S2 EVM:
1. Fusion board (For FPDLink-III cameras)
2. OV5640 camera module
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index ea727bd3..dacb6143 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -33,6 +33,8 @@ KERNEL_DEVICETREE = " \
ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
ti/k3-j721s2-common-proc-board.dtb \
+ ti/k3-j721s2-cpb-csi2-ov5640.dtbo \
+ ti/k3-j721s2-fpdlink-cpb-fusion.dtbo \
ti/k3-j721s2-gesi-exp-board.dtbo \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 41/54] conf: machine: j784s4-evm: Add camera overlays for J784S4 EVM
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (39 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 40/54] conf: machine: j721s2-evm: Add camera overlays for J721S2 EVM Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 42/54] conf: machine: j7200-evm: Add uarts overlay for J7200 Denys Dmytriyenko
` (12 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Vaishnav Achath <vaishnav.a@ti.com>
Add the following overlay files on J784S4 EVM:
1. Fusion board (For FPDLink-III cameras)
2. OV5640 camera module
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 40e71b6a..02f3f4c4 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -33,6 +33,8 @@ KERNEL_DEVICETREE = " \
ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
ti/k3-j784s4-evm.dtb \
+ ti/k3-j784s4-evm-csi2-ov5640.dtbo \
+ ti/k3-j784s4-fpdlink-fusion.dtbo \
"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 42/54] conf: machine: j7200-evm: Add uarts overlay for J7200
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (40 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 41/54] conf: machine: j784s4-evm: Add camera overlays for J784S4 EVM Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 43/54] conf: machine: j721e-evm: Add uarts overlay for J721E Denys Dmytriyenko
` (11 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Bhavya Kapoor <b-kapoor@ti.com>
Add device tree overlay for extending support for mcu_uart0 as well as
wkup_uart0 for boards with J7200 SoC. This overlay will mainly be used
for the purpose of testing uart instances.
Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j7200-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
index e52d6371..c01b318b 100644
--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -10,6 +10,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
KERNEL_DEVICETREE = " \
ti/k3-j7200-common-proc-board.dtb \
ti/k3-j7200-mcspi-loopback.dtbo \
+ ti/k3-j7200-common-proc-board-uarts.dtbo \
"
UBOOT_MACHINE = "j7200_evm_a72_config"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 43/54] conf: machine: j721e-evm: Add uarts overlay for J721E
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (41 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 42/54] conf: machine: j7200-evm: Add uarts overlay for J7200 Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 44/54] conf: machine: j721s2-evm: Add uarts overlay for J721S2 Denys Dmytriyenko
` (10 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Bhavya Kapoor <b-kapoor@ti.com>
Add device tree overlay for extending support for mcu_uart0 as well as
wkup_uart0 for boards with J721E SoC. This overlay will mainly be used
for the purpose of testing uart instances.
Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721e-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
index aa966263..7249ecb2 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -32,6 +32,7 @@ KERNEL_DEVICETREE = " \
ti/k3-j721e-fpdlink-sk-fusion.dtbo \
ti/k3-j721e-sk-csi2-ov5640.dtbo \
ti/k3-j721e-sk-rpi-cam-imx219.dtbo \
+ ti/k3-j721e-common-proc-board-uarts.dtbo \
"
UBOOT_MACHINE = "j721e_evm_a72_config"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 44/54] conf: machine: j721s2-evm: Add uarts overlay for J721S2
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (42 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 43/54] conf: machine: j721e-evm: Add uarts overlay for J721E Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 45/54] conf: machine: j784s4-evm: Add uarts overlay for J784S4 Denys Dmytriyenko
` (9 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Bhavya Kapoor <b-kapoor@ti.com>
Add device tree overlay for extending support for mcu_uart0 as well as
wkup_uart0 for boards with J721S2 SoC. This overlay will mainly be used
for the purpose of testing uart instances.
Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index dacb6143..e69b5c10 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -36,6 +36,7 @@ KERNEL_DEVICETREE = " \
ti/k3-j721s2-cpb-csi2-ov5640.dtbo \
ti/k3-j721s2-fpdlink-cpb-fusion.dtbo \
ti/k3-j721s2-gesi-exp-board.dtbo \
+ ti/k3-j721s2-common-proc-board-uarts.dtbo \
"
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 45/54] conf: machine: j784s4-evm: Add uarts overlay for J784S4
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (43 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 44/54] conf: machine: j721s2-evm: Add uarts overlay for J721S2 Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 46/54] conf: machine: j721e-evm: Add MCSPI loopback overlay for J721E Denys Dmytriyenko
` (8 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Bhavya Kapoor <b-kapoor@ti.com>
Add device tree overlay for extending support for mcu_uart0 as well as
wkup_uart0 for boards with J784S4 SoC. This overlay will mainly be used
for the purpose of testing uart instances.
Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j784s4-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 02f3f4c4..b06153a8 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -35,6 +35,7 @@ KERNEL_DEVICETREE = " \
ti/k3-j784s4-evm.dtb \
ti/k3-j784s4-evm-csi2-ov5640.dtbo \
ti/k3-j784s4-fpdlink-fusion.dtbo \
+ ti/k3-j784s4-evm-uarts.dtbo \
"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 46/54] conf: machine: j721e-evm: Add MCSPI loopback overlay for J721E
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (44 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 45/54] conf: machine: j784s4-evm: Add uarts overlay for J784S4 Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 47/54] conf: machine: j721s2-evm: Add MCSPI loopback overlay for J721S2 Denys Dmytriyenko
` (7 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Vaishnav Achath <vaishnav.a@ti.com>
Add the MCSPI loopback overlay file for J721E EVM which helps
users to enable MCU-MAIN MCSPI loopback applications, even though
the overlay is named j7200-mcspi-loopback.dtbo, same can be used
for testing on other J7 platforms as well.
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721e-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
index 7249ecb2..029b1fe7 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -33,6 +33,7 @@ KERNEL_DEVICETREE = " \
ti/k3-j721e-sk-csi2-ov5640.dtbo \
ti/k3-j721e-sk-rpi-cam-imx219.dtbo \
ti/k3-j721e-common-proc-board-uarts.dtbo \
+ ti/k3-j7200-mcspi-loopback.dtbo \
"
UBOOT_MACHINE = "j721e_evm_a72_config"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 47/54] conf: machine: j721s2-evm: Add MCSPI loopback overlay for J721S2
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (45 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 46/54] conf: machine: j721e-evm: Add MCSPI loopback overlay for J721E Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 48/54] conf: machine: j784s4-evm: Add MCSPI loopback overlay for J784S4 Denys Dmytriyenko
` (6 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Vaishnav Achath <vaishnav.a@ti.com>
Add the MCSPI loopback overlay file for J721S2 EVM which helps
users to enable MCU-MAIN MCSPI loopback applications, even though
the overlay is named j7200-mcspi-loopback.dtbo, same can be used
for testing on other J7 platforms as well.
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index e69b5c10..5a32e1b3 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -37,6 +37,7 @@ KERNEL_DEVICETREE = " \
ti/k3-j721s2-fpdlink-cpb-fusion.dtbo \
ti/k3-j721s2-gesi-exp-board.dtbo \
ti/k3-j721s2-common-proc-board-uarts.dtbo \
+ ti/k3-j7200-mcspi-loopback.dtbo \
"
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 48/54] conf: machine: j784s4-evm: Add MCSPI loopback overlay for J784S4
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (46 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 47/54] conf: machine: j721s2-evm: Add MCSPI loopback overlay for J721S2 Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 49/54] conf: machine: am62axx: Add overlay for second CPSW3G Port Denys Dmytriyenko
` (5 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Vaishnav Achath <vaishnav.a@ti.com>
Add the MCSPI loopback overlay file for J784S4 EVM which helps
users to enable MCU-MAIN MCSPI loopback applications, even though
the overlay is named j7200-mcspi-loopback.dtbo, same can be used
for testing on other J7 platforms as well.
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/j784s4-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index b06153a8..84fd4996 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -36,6 +36,7 @@ KERNEL_DEVICETREE = " \
ti/k3-j784s4-evm-csi2-ov5640.dtbo \
ti/k3-j784s4-fpdlink-fusion.dtbo \
ti/k3-j784s4-evm-uarts.dtbo \
+ ti/k3-j7200-mcspi-loopback.dtbo \
"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 49/54] conf: machine: am62axx: Add overlay for second CPSW3G Port
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (47 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 48/54] conf: machine: j784s4-evm: Add MCSPI loopback overlay for J784S4 Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 50/54] ti-k3-secdev: update to the latest from Dunfell Denys Dmytriyenko
` (4 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Siddharth Vadapalli <s-vadapalli@ti.com>
The SK-Ethernet-DC01 Add-On Ethernet Card for AM62A-SK board supports
RGMII mode.
Add overlay to enable the second CPSW3G port in RGMII-RXID mode with the
Add-On Ethernet Card.
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am62axx-evm.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index 9dcb6e55..2fd91bd7 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -12,6 +12,7 @@ KERNEL_DEVICETREE = " \
ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \
ti/k3-am62a7-fpdlink-sk-fusion.dtbo \
ti/k3-am62a7-sk-csi2-imx219.dtbo \
+ ti/k3-am62a7-sk-ethernet-dc01.dtbo \
ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 50/54] ti-k3-secdev: update to the latest from Dunfell
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (48 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 49/54] conf: machine: am62axx: Add overlay for second CPSW3G Port Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 51/54] ti-linux-fw: " Denys Dmytriyenko
` (3 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Denys Dmytriyenko <denys@konsulko.com>
Match the latest sha used in Dunfell.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
index b4c26f68..87987ae0 100644
--- a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
+++ b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE:class-nativesdk = "(.*)"
GIT_URI = "git://git.ti.com/git/security-development-tools/core-secdev-k3.git"
GIT_PROTOCOL = "https"
GIT_BRANCH = "master"
-GIT_SRCREV = "eb2c4d734487e5095b94cef3fd7213ee71d9e016"
+GIT_SRCREV = "bba9cabaeee96f7f287385188ff289b46769a4bf"
SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}"
SRCREV = "${GIT_SRCREV}"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 51/54] ti-linux-fw: update to the latest from Dunfell
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (49 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 50/54] ti-k3-secdev: update to the latest from Dunfell Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 52/54] u-boot-ti-staging: " Denys Dmytriyenko
` (2 subsequent siblings)
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Denys Dmytriyenko <denys@konsulko.com>
Match the latest sha used in Dunfell.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 74c26707..1a5ea534 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -16,12 +16,12 @@ IMG_DEC_FW_VERSION = "1.0"
CNM_WAVE521_FW_VERSION = "1.0.00"
TIFS_LPM_STUB_FW_VERSION = "08.06.04"
-TI_LINUX_FW_SRCREV ?= "340194800a581baf976360386dfc7b5acab8d948"
+TI_LINUX_FW_SRCREV ?= "79c498ef6ab1558b699a2243a26c4a65a1c44d26"
SRCREV = "${TI_LINUX_FW_SRCREV}"
BRANCH ?= "ti-linux-firmware"
-K3_IMAGE_GEN_SRCREV ?= "ffae8800a5c81c149835ed1aa5e2fbbe65a49c0d"
+K3_IMAGE_GEN_SRCREV ?= "1319f46f3899e62d88e0a5cedad5b454d0432ddb"
SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
SRCREV_FORMAT = "imggen"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 52/54] u-boot-ti-staging: update to the latest from Dunfell
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (50 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 51/54] ti-linux-fw: " Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 53/54] linux-ti-staging: " Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 54/54] ti-rtos-firmware: numerous fixes and cleanups Denys Dmytriyenko
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Denys Dmytriyenko <denys@konsulko.com>
Match the latest sha used in Dunfell.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 1640d042..7763d8b1 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -6,4 +6,4 @@ PR = "r33"
BRANCH = "ti-u-boot-2021.01"
-SRCREV = "78a217ca9ea687ee5c3e7dd3a339a1f7d136e93d"
+SRCREV = "2ee8efd6543648c6b8a14d93d52a6038854035c8"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 53/54] linux-ti-staging: update to the latest from Dunfell
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (51 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 52/54] u-boot-ti-staging: " Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
2023-03-20 3:38 ` [kirkstone][PATCH 54/54] ti-rtos-firmware: numerous fixes and cleanups Denys Dmytriyenko
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Denys Dmytriyenko <denys@konsulko.com>
Match the latest sha used in Dunfell.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 4 ++--
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index e872b86e..c950fc80 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
BRANCH = "ti-rt-linux-5.10.y"
-SRCREV = "fe20c3f42e9028a31cb79439c40d3e18d2207342"
-PV = "5.10.145+git${SRCPV}"
+SRCREV = "c1a12919117a6978f40e723d6e0c67c744e026b9"
+PV = "5.10.168+git${SRCPV}"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index e6d4b107..cc67188a 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -22,8 +22,8 @@ S = "${WORKDIR}/git"
BRANCH = "ti-linux-5.10.y"
-SRCREV = "8b51d20b6e6e1b9277b59b7aaed8a97eff43097f"
-PV = "5.10.145+git${SRCPV}"
+SRCREV = "2c23e6c538c879e380401ae4b236f54020618eaa"
+PV = "5.10.168+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
MACHINE_KERNEL_PR:append = "b"
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread* [kirkstone][PATCH 54/54] ti-rtos-firmware: numerous fixes and cleanups
2023-03-20 3:37 [kirkstone][PATCH 00/54] 2023.03 sync up with Dunfell Denys Dmytriyenko
` (52 preceding siblings ...)
2023-03-20 3:38 ` [kirkstone][PATCH 53/54] linux-ti-staging: " Denys Dmytriyenko
@ 2023-03-20 3:38 ` Denys Dmytriyenko
53 siblings, 0 replies; 59+ messages in thread
From: Denys Dmytriyenko @ 2023-03-20 3:38 UTC (permalink / raw)
To: meta-ti
From: Denys Dmytriyenko <denys@konsulko.com>
Doing multiple do_install:prepend overrides does not guarantee the
order - it was observed that signing could fail as it was happening
prior to symlinking to the correct name. Move signing code inside the
main do_install, so the machine-specific do_install:prepend works
correctly.
Also, pass -f flag for symlinking, otherwise it could fail with "file
already exists" error when trying to re-build the recipe again.
Several IPC list/matrix fixes:
* j721e was missing MCU_1_1_FW entry
* j721s2 was also missing MCU_1_1_FW entry
* j721s2 had a second MCU_2_0_FW in place of MCU_3_0_FW
* j784s4 was missing MCU_4_0_FW and MCU_4_1_FW entries
Other minor cleanups and indentation fixes.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../ti-rtos-bin/ti-rtos-firmware.bb | 63 +++++++++----------
1 file changed, 31 insertions(+), 32 deletions(-)
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 9b94a61e..ae7bdb81 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -64,105 +64,103 @@ C7X_4_FW = "ipc_echo_test_c7x_4_release_strip.xe71"
ETH_FW = "app_remoteswitchcfg_server_strip.xer5f"
DM_FW_LIST = ""
-DM_FW_LIST:am65xx = ""
DM_FW_LIST:j721e = "${DM_FIRMWARE}"
DM_FW_LIST:j7200 = "${DM_FIRMWARE}"
DM_FW_LIST:j721s2 = "${DM_FIRMWARE}"
+DM_FW_LIST:j784s4 = "${DM_FIRMWARE}"
+DM_FW_LIST:am65xx = ""
DM_FW_LIST:am64xx = ""
DM_FW_LIST:am62xx = "${DM_FIRMWARE}"
DM_FW_LIST:am62axx = "${DM_FIRMWARE}"
-DM_FW_LIST:j784s4 = "${DM_FIRMWARE}"
IPC_FW_LIST = ""
-IPC_FW_LIST:am65xx = "${MCU_1_0_FW} ${MCU_1_1_FW}"
-IPC_FW_LIST:j721e = " ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}"
+IPC_FW_LIST:j721e = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}"
IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}"
-IPC_FW_LIST:j721s2 = " ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_2_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW}"
+IPC_FW_LIST:j721s2 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW}"
+IPC_FW_LIST:j784s4 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${MCU_4_0_FW} ${MCU_4_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}"
+IPC_FW_LIST:am65xx = "${MCU_1_0_FW} ${MCU_1_1_FW}"
IPC_FW_LIST:am64xx = "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW}"
IPC_FW_LIST:am62xx = " ${MCU_2_0_FW}"
-IPC_FW_LIST:am62axx = " ${MCU_2_0_FW} ${C7X_1_FW}"
-IPC_FW_LIST:j784s4 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}"
+IPC_FW_LIST:am62axx = " ${MCU_2_0_FW} ${C7X_1_FW}"
ETH_FW_LIST = ""
-ETH_FW_LIST:am65xx = ""
ETH_FW_LIST:j721e = "${ETH_FW}"
ETH_FW_LIST:j7200 = "${ETH_FW}"
ETH_FW_LIST:j721s2 = ""
+ETH_FW_LIST:j784s4 = "${ETH_FW}"
+ETH_FW_LIST:am65xx = ""
ETH_FW_LIST:am64xx = ""
ETH_FW_LIST:am62xx = ""
ETH_FW_LIST:am62axx = ""
-ETH_FW_LIST:j784s4 = "${ETH_FW}"
# Update the am64xx ipc binaries to be consistent with other platforms
do_install:prepend:am64xx() {
( cd ${RTOS_IPC_FW_DIR}; \
- ln -s am64-main-r5f0_0-fw ${MCU_1_0_FW}; \
- ln -s am64-main-r5f0_1-fw ${MCU_1_1_FW}; \
- ln -s am64-main-r5f1_0-fw ${MCU_2_0_FW}; \
- ln -s am64-main-r5f1_1-fw ${MCU_2_1_FW}; \
- ln -s am64-mcu-m4f0_0-fw ${MCU_3_0_FW}; \
+ ln -sf am64-main-r5f0_0-fw ${MCU_1_0_FW}; \
+ ln -sf am64-main-r5f0_1-fw ${MCU_1_1_FW}; \
+ ln -sf am64-main-r5f1_0-fw ${MCU_2_0_FW}; \
+ ln -sf am64-main-r5f1_1-fw ${MCU_2_1_FW}; \
+ ln -sf am64-mcu-m4f0_0-fw ${MCU_3_0_FW}; \
)
}
# Update the am62xx ipc binaries to be consistent with other platforms
do_install:prepend:am62xx() {
( cd ${RTOS_IPC_FW_DIR}; \
- ln -s am62-mcu-m4f0_0-fw ${MCU_2_0_FW}; \
+ ln -sf am62-mcu-m4f0_0-fw ${MCU_2_0_FW}; \
)
}
# Update the am62axx ipc binaries to be consistent with other platforms
do_install:prepend:am62axx() {
( cd ${RTOS_IPC_FW_DIR}; \
- ln -s am62a-mcu-r5f0_0-fw ${MCU_1_0_FW}; \
+ ln -sf am62a-mcu-r5f0_0-fw ${MCU_2_0_FW}; \
)
}
-# Sign the firmware
-do_install:prepend() {
+do_install() {
+ # Sign the firmware
# DM Firmware
for FW_NAME in ${DM_FW_LIST}
do
- ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${RTOS_DM_FW_DIR}/${FW_NAME} ${RTOS_DM_FW_DIR}/${FW_NAME}.signed
+ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${RTOS_DM_FW_DIR}/${FW_NAME} ${RTOS_DM_FW_DIR}/${FW_NAME}.signed
done
# IPC Firmware
for FW_NAME in ${IPC_FW_LIST}
do
- ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${RTOS_IPC_FW_DIR}/${FW_NAME} ${RTOS_IPC_FW_DIR}/${FW_NAME}.signed
+ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${RTOS_IPC_FW_DIR}/${FW_NAME} ${RTOS_IPC_FW_DIR}/${FW_NAME}.signed
done
# ETH firmware
for FW_NAME in ${ETH_FW_LIST}
do
- ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${RTOS_ETH_FW_DIR}/${FW_NAME} ${RTOS_ETH_FW_DIR}/${FW_NAME}.signed;
+ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${RTOS_ETH_FW_DIR}/${FW_NAME} ${RTOS_ETH_FW_DIR}/${FW_NAME}.signed
done
-}
-#Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level
-do_install() {
+ # Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level
# DM Firmware
install -d ${LEGACY_DM_FW_DIR}
for FW_NAME in ${DM_FW_LIST}
do
- install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME} ${LEGACY_DM_FW_DIR}/${FW_NAME}.unsigned
- install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME}.signed ${LEGACY_DM_FW_DIR}/${FW_NAME}
+ install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME} ${LEGACY_DM_FW_DIR}/${FW_NAME}.unsigned
+ install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME}.signed ${LEGACY_DM_FW_DIR}/${FW_NAME}
done
# IPC Firmware
install -d ${LEGACY_IPC_FW_DIR}
for FW_NAME in ${IPC_FW_LIST}
do
- install -m 0644 ${RTOS_IPC_FW_DIR}/${FW_NAME} ${LEGACY_IPC_FW_DIR}
- install -m 0644 ${RTOS_IPC_FW_DIR}/${FW_NAME}.signed ${LEGACY_IPC_FW_DIR}
+ install -m 0644 ${RTOS_IPC_FW_DIR}/${FW_NAME} ${LEGACY_IPC_FW_DIR}
+ install -m 0644 ${RTOS_IPC_FW_DIR}/${FW_NAME}.signed ${LEGACY_IPC_FW_DIR}
done
# ETH firmware
install -d ${LEGACY_ETH_FW_DIR}
for FW_NAME in ${ETH_FW_LIST}
do
- install -m 0644 ${RTOS_ETH_FW_DIR}/${FW_NAME} ${LEGACY_ETH_FW_DIR}
- install -m 0644 ${RTOS_ETH_FW_DIR}/${FW_NAME}.signed ${LEGACY_ETH_FW_DIR}
+ install -m 0644 ${RTOS_ETH_FW_DIR}/${FW_NAME} ${LEGACY_ETH_FW_DIR}
+ install -m 0644 ${RTOS_ETH_FW_DIR}/${FW_NAME}.signed ${LEGACY_ETH_FW_DIR}
done
}
@@ -171,8 +169,8 @@ do_deploy() {
install -d ${DEPLOYDIR}
for FW_NAME in ${DM_FW_LIST}
do
- install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME} ${DEPLOYDIR}/${FW_NAME}.unsigned
- install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME}.signed ${DEPLOYDIR}/${FW_NAME}
+ install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME} ${DEPLOYDIR}/${FW_NAME}.unsigned
+ install -m 0644 ${RTOS_DM_FW_DIR}/${FW_NAME}.signed ${DEPLOYDIR}/${FW_NAME}
done
}
@@ -189,6 +187,7 @@ ALTERNATIVE:${PN}:am64xx = "\
am64-main-r5f1_1-fw \
am64-mcu-m4f0_0-fw \
"
+
ALTERNATIVE:${PN}:am62xx = "\
am62-mcu-m4f0_0-fw \
am62-main-r5f0_0-fw \
--
2.25.1
^ permalink raw reply related [flat|nested] 59+ messages in thread