Skip to contentSkip to conversation

conf: machine: Remove multi-certificate image comment

PATCH In review Andrew Davis 3 participants 24 messages Dec 7, 2022 – Jan 20, 2023 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/7 conf: machine: Remove multi-certificate image comment

Multi-cert is already now the default, no need to add a comment on that.

---
 meta-ti-bsp/conf/machine/include/j7.inc | 2 --
 1 file changed, 2 deletions(-)
meta-ti-bsp/conf/machine/include/j7.inc +0 -2
index 4ea3a5d8..cf4cc440 100644
@@ -3,5 +3,3 @@ SOC_FAMILY:append = ":j7"
 
 OPTEEMACHINE = "k3-j721e"
 OPTEEOUTPUTMACHINE = "k3"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
Signature · 1 line
2.38.1
#1 lore raw

PATCH 2/7 conf: machine: j784s4: Move common defines into j784s4.inc

Like we do with J721e, J7200, and J721s2, use a SoC header include file to define common properties. This eases adding new boards based on these SoC.

---
 meta-ti-bsp/conf/machine/include/j784s4.inc | 10 ++++++++++
 meta-ti-bsp/conf/machine/j784s4-evm.conf    |  4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 meta-ti-bsp/conf/machine/include/j784s4.inc
meta-ti-bsp/conf/machine/include/j784s4.inc new file +10 -0
new file mode 100644
index 00000000..d7a598d6
@@ -0,0 +1,10 @@
+require conf/machine/include/j7.inc
+SOC_FAMILY:append = ":j784s4"
+
+MACHINE_FEATURES += "gpu"
+
+PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
meta-ti-bsp/conf/machine/j784s4-evm.conf +1 -3
index 96acca13..10d8aad0 100644
@@ -2,9 +2,7 @@
 #@NAME: J784S4 EVM
 #@DESCRIPTION: Machine configuration for the TI J784S4 EVM
 
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
+require conf/machine/include/j784s4.inc
 
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
Signature · 1 line
2.38.1
#2 lore raw

PATCH 3/7 conf: machine: Use new J7 SoC names over specific board names

In reply to Andrew Davis

Now that we have SoC names, we can avoid adding features based on the board name. We expect folks to create their own boards based on these SoCs, and so using the TI made EVM board name everywhere adds extra churn when adding a new board. Plus it is more correct for most of these features as they depend on the SoC, not on the EVM board.

One other thing we do here is to not use the generic "j7" name, the current and future J7 devices are far to feature diverse to group at this level. Grouping like that will lead to the wrong things getting enabled as new J7 SoCs are added.

---
 .../cnm-wave-fw/cnm-wave-fw_git.bb            |  3 +-
 .../ti-img-encode-decode/vxd-dec-fw_git.bb    |  2 +-
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  |  5 ++-
 .../recipes-kernel/linux/kernel-rdepends.inc  |  2 +-
 .../linux/linux-ti-staging_5.10.bb            |  2 +-
 .../ti-rtos-bin/ti-rtos-firmware.bb           | 39 +++++++++----------
 .../ti-rtos-bin/ti-rtos-metadata.bb           |  6 +--
 .../recipes-bsp/pru/pru-icss_git.bb           | 10 ++---
 8 files changed, 34 insertions(+), 35 deletions(-)
meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +1 -2
index 0e8ed897..e7aa9ef4 100644
@@ -27,8 +27,7 @@ ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm
 ALTERNATIVE_PRIORITY = "10"
 
 # Set up names for the firmwares
-ALTERNATIVE_${PN}:j7 = "\
-                    wave521c_codec_fw.bin"
+ALTERNATIVE_${PN} = "wave521c_codec_fw.bin"
 
 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/cnm
meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb +1 -1
index 7727e9af..bd103198 100644
@@ -9,7 +9,7 @@ PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j721e"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +4 -1
index 5127e137..6f5b6313 100644
@@ -32,7 +32,10 @@ PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/b
 PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE},,ti-rtos-firmware"
 
 PACKAGECONFIG:append:aarch64 = " atf optee"
-PACKAGECONFIG:append:j7 = " dm"
+PACKAGECONFIG:append:j721e = " dm"
+PACKAGECONFIG:append:j7200 = " dm"
+PACKAGECONFIG:append:j721s2 = " dm"
+PACKAGECONFIG:append:j784s4 = " dm"
 PACKAGECONFIG:append:am62xx = " dm"
 
 COMPATIBLE_MACHINE = "(ti-soc)"
meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +1 -1
index 43cd31fe..54e6fdc6 100644
@@ -26,7 +26,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw"
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cadence-mhdp-fw"
 
 # Add run-time dependency for Video Decoding firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw"
+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"
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +1 -1
index bf230dbc..67b28b2a 100644
@@ -42,4 +42,4 @@ module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
 module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
 module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
 KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
-KERNEL_MODULE_AUTOLOAD:append:j7 = " rpmsg_kdrv_switch"
+KERNEL_MODULE_AUTOLOAD:append:j721e = " rpmsg_kdrv_switch"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +18 -21
index 0447bafe..9a6da088 100644
@@ -13,13 +13,10 @@ inherit deploy
 inherit update-alternatives
 
 PLAT_SFX = ""
-PLAT_SFX:j7 = "j721e"
-PLAT_SFX:j721e-hs-evm = "j721e"
-PLAT_SFX:j7200-evm = "j7200"
-PLAT_SFX:j7200-hs-evm = "j7200"
-PLAT_SFX:j721s2-evm = "j721s2"
-PLAT_SFX:j721s2-hs-evm = "j721s2"
-PLAT_SFX:j784s4-evm = "j784s4"
+PLAT_SFX:j721e = "j721e"
+PLAT_SFX:j7200 = "j7200"
+PLAT_SFX:j721s2 = "j721s2"
+PLAT_SFX:j784s4 = "j784s4"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
@@ -50,7 +47,7 @@ LEGACY_DM_FW_DIR  = "${D}${nonarch_base_libdir}/firmware/pdk-ipc/"
 
 DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
 
-# J7 HS support
+# J721e HS support
 do_install:prepend:j721e-hs-evm() {
         export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
         ( cd ${RTOS_DM_FW_DIR}; \
@@ -81,7 +78,7 @@ do_install:prepend:j721e-hs-evm() {
         )
 }
 
-# J7 HS support
+# J7200 HS support
 do_install:prepend:j7200-hs-evm() {
         export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
         ( cd ${RTOS_DM_FW_DIR}; \
@@ -102,7 +99,7 @@ do_install:prepend:j7200-hs-evm() {
         )
 }
 
-# J7 HS support
+# J721s2 HS support
 do_install:prepend:j721s2-hs-evm() {
         export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
         ( cd ${RTOS_DM_FW_DIR}; \
@@ -149,7 +146,7 @@ do_install() {
 	:
 }
 
-do_install:j7() {
+do_install:j721e() {
     install -d ${LEGACY_IPC_FW_DIR}
     install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
     install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
@@ -335,7 +332,7 @@ ALTERNATIVE:${PN}:j721e-hs-evm = "\
                     j7-c71_0-fw-sec \
                     "
 
-ALTERNATIVE:${PN}:j7 = "\
+ALTERNATIVE:${PN}:j721e-evm = "\
                     j7-mcu-r5f0_0-fw \
                     j7-mcu-r5f0_1-fw \
                     j7-main-r5f0_0-fw \
@@ -420,15 +417,15 @@ TARGET_MCU_M4FSS0_0:am64xx = "am64-mcu-m4f0_0-fw"
 TARGET_MAIN_R5FSS0_0:am62xx = "am62-main-r5f0_0-fw"
 TARGET_MCU_M4FSS0_0:am62xx = "am62-mcu-m4f0_0-fw"
 
-TARGET_MCU_R5FSS0_0:j7 = "j7-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1:j7 = "j7-mcu-r5f0_1-fw"
-TARGET_MAIN_R5FSS0_0:j7 = "j7-main-r5f0_0-fw"
-TARGET_MAIN_R5FSS0_1:j7 = "j7-main-r5f0_1-fw"
-TARGET_MAIN_R5FSS1_0:j7 = "j7-main-r5f1_0-fw"
-TARGET_MAIN_R5FSS1_1:j7 = "j7-main-r5f1_1-fw"
-TARGET_C66_0:j7 = "j7-c66_0-fw"
-TARGET_C66_1:j7 = "j7-c66_1-fw"
-TARGET_C7X_0:j7 = "j7-c71_0-fw"
+TARGET_MCU_R5FSS0_0:j721e = "j7-mcu-r5f0_0-fw"
+TARGET_MCU_R5FSS0_1:j721e = "j7-mcu-r5f0_1-fw"
+TARGET_MAIN_R5FSS0_0:j721e = "j7-main-r5f0_0-fw"
+TARGET_MAIN_R5FSS0_1:j721e = "j7-main-r5f0_1-fw"
+TARGET_MAIN_R5FSS1_0:j721e = "j7-main-r5f1_0-fw"
+TARGET_MAIN_R5FSS1_1:j721e = "j7-main-r5f1_1-fw"
+TARGET_C66_0:j721e = "j7-c66_0-fw"
+TARGET_C66_1:j721e = "j7-c66_1-fw"
+TARGET_C7X_0:j721e = "j7-c71_0-fw"
 
 TARGET_MAIN_R5FSS0_0_SIGNED:j721e-hs-evm = "j7-main-r5f0_0-fw-sec"
 TARGET_MAIN_R5FSS0_1_SIGNED:j721e-hs-evm = "j7-main-r5f0_1-fw-sec"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +3 -3
index be1ff013..ff715ce0 100644
@@ -1,7 +1,7 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
-COMPATIBLE_MACHINE = "ti-soc"
+COMPATIBLE_MACHINE = "j721e|j7200|am65xx|am64xx"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -10,8 +10,8 @@ INHIBIT_DEFAULT_DEPS = "1"
 inherit nopackages deploy
 
 PLAT_SFX = ""
-PLAT_SFX:j7 = "/j721e"
-PLAT_SFX:j7200-evm = "/j7200"
+PLAT_SFX:j721e = "/j721e"
+PLAT_SFX:j7200 = "/j7200"
 PLAT_SFX:am65xx = "/am65xx"
 PLAT_SFX:am64xx = "/am64x"
 
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +5 -5
index cb2f8cc2..e3b5290a 100644
@@ -15,7 +15,7 @@ PR = "r0"
 
 require recipes-ti/includes/ti-paths.inc
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am62xx|am64xx|am65xx|j721e"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES:prepend = " \
@@ -43,7 +43,7 @@ PLATFORM:omap-a15 = "am572x"
 PLATFORM:am62xx = "am62x"
 PLATFORM:am64xx = "am64x"
 PLATFORM:am65xx = "am65x"
-PLATFORM:j7 = "j721e"
+PLATFORM:j721e = "j721e"
 
 do_compile() {
     for dir in ${SUBDIRS}
@@ -155,7 +155,7 @@ do_install:append:am65xx() {
     done
 }
 
-do_install:append:j7() {
+do_install:append:j721e() {
     for i in 0 1
     do
         install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
@@ -189,7 +189,7 @@ PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_
 PRU_ICSS_ALTERNATIVES:am62xx   = "am62x-pru0-fw am62x-pru1-fw"
 PRU_ICSS_ALTERNATIVES:am64xx   = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
 PRU_ICSS_ALTERNATIVES:am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
-PRU_ICSS_ALTERNATIVES:j7       = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
+PRU_ICSS_ALTERNATIVES:j721e    = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
 
 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/am335x-pru0-fw"
@@ -259,7 +259,7 @@ ALTERNATIVE:pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
 # Only Halt firmware images are supported for the Tx_PRU cores
 ALTERNATIVE:pru-icss-halt:append:am64xx = " am64x-txpru0_0-fw am64x-txpru0_1-fw am64x-txpru1_0-fw am64x-txpru1_1-fw"
 ALTERNATIVE:pru-icss-halt:append:am65xx = " am65x-txpru0_0-fw am65x-txpru0_1-fw am65x-txpru1_0-fw am65x-txpru1_1-fw am65x-txpru2_0-fw am65x-txpru2_1-fw"
-ALTERNATIVE:pru-icss-halt:append:j7 = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"
+ALTERNATIVE:pru-icss-halt:append:j721e  = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"
 
 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out"
Signature · 1 line
2.38.1
#5 lore raw

PATCH 4/7 conf: machine: Remove j7 grouping and j7.inc

In reply to Andrew Davis

J7 is an unneeded level of grouping that is now causing issues and leading to mistakes when adding new J7 based platforms. Each J7x family device should use the SoC name specifically to prevent accidentally adding or removing features that are not meant for the new SoC.

---
 meta-ti-bsp/conf/machine/include/j7.inc     | 5 -----
 meta-ti-bsp/conf/machine/include/j7200.inc  | 5 ++++-
 meta-ti-bsp/conf/machine/include/j721e.inc  | 5 ++++-
 meta-ti-bsp/conf/machine/include/j721s2.inc | 5 ++++-
 meta-ti-bsp/conf/machine/include/j784s4.inc | 5 ++++-
 5 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 meta-ti-bsp/conf/machine/include/j7.inc
meta-ti-bsp/conf/machine/include/j7.inc deleted +0 -5
deleted file mode 100644
index cf4cc440..00000000
@@ -1,5 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":j7"
-
-OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j7200.inc +4 -1
index ce88567c..3aedb3f8 100644
@@ -1,2 +1,5 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j7200"
+
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j721e.inc +4 -1
index fe260178..8a6c2bec 100644
@@ -1,6 +1,9 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721e"
 
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
+
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
meta-ti-bsp/conf/machine/include/j721s2.inc +4 -1
index 5cd74683..4959ad8f 100644
@@ -1,6 +1,9 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721s2"
 
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
+
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
meta-ti-bsp/conf/machine/include/j784s4.inc +4 -1
index d7a598d6..83d7c760 100644
@@ -1,6 +1,9 @@
-require conf/machine/include/j7.inc
+require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j784s4"
 
+OPTEEMACHINE = "k3-j721e"
+OPTEEOUTPUTMACHINE = "k3"
+
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
Signature · 1 line
2.38.1
#6 lore raw

PATCH 5/7 conf: machine: Remove OPTEEOUTPUTMACHINE definition

In reply to Andrew Davis

This was used in the base Linaro optee-os_git.bb recipe, it is no longer used, remove it from our boards.

---
 meta-ti-bsp/conf/machine/am437x-hs-evm.conf | 1 -
 meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | 1 -
 meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | 1 -
 meta-ti-bsp/conf/machine/include/am62xx.inc | 1 -
 meta-ti-bsp/conf/machine/include/am64xx.inc | 1 -
 meta-ti-bsp/conf/machine/include/am65xx.inc | 1 -
 meta-ti-bsp/conf/machine/include/j7200.inc  | 1 -
 meta-ti-bsp/conf/machine/include/j721e.inc  | 1 -
 meta-ti-bsp/conf/machine/include/j721s2.inc | 1 -
 meta-ti-bsp/conf/machine/include/j784s4.inc | 1 -
 10 files changed, 10 deletions(-)
meta-ti-bsp/conf/machine/am437x-hs-evm.conf +0 -1
index 68b808d2..cdd664ac 100644
@@ -15,6 +15,5 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
 
 OPTEEMACHINE = "ti-am43xx"
 OPTEEFLAVOR = "am43xx"
-OPTEEOUTPUTMACHINE = "ti"
 
 EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +0 -1
index 5232cbd9..1e63f5d2 100644
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
 
 OPTEEMACHINE = "ti-am57xx"
 OPTEEFLAVOR = "am57xx"
-OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"
 
 EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +0 -1
index 49630081..810d53ed 100644
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
 
 OPTEEMACHINE = "ti-dra7xx"
 OPTEEFLAVOR = "dra7xx"
-OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"
 
 EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -1
index a5aad994..9d8bc87c 100644
@@ -19,4 +19,3 @@ TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
 OPTEEMACHINE = "k3-am62x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/am64xx.inc +0 -1
index 055f6036..7c46b630 100644
@@ -33,4 +33,3 @@ do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am64x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/am65xx.inc +0 -1
index 80aa6d27..14e0d07f 100644
@@ -38,4 +38,3 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
 OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j7200.inc +0 -1
index 3aedb3f8..1eaf7806 100644
@@ -2,4 +2,3 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j7200"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j721e.inc +0 -1
index 8a6c2bec..34569a01 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721e"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
 MACHINE_FEATURES += "gpu"
 
meta-ti-bsp/conf/machine/include/j721s2.inc +0 -1
index 4959ad8f..2a60458e 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721s2"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
 MACHINE_FEATURES += "gpu"
 
meta-ti-bsp/conf/machine/include/j784s4.inc +0 -1
index 83d7c760..e2f053ac 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j784s4"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
 MACHINE_FEATURES += "gpu"
 
Signature · 1 line
2.38.1
#9 lore raw

PATCH 6/7 conf: machine: Move TFA_BOARD and OPTEEMACHINE to the SoC level

In reply to Andrew Davis

These defines are specific to a SoC, not a SoC family (K3) nor any specific board. Move these to the SoC level for all boards to be consistent with boards already doing this correctly.

---
 meta-ti-bsp/conf/machine/include/am64xx.inc | 1 +
 meta-ti-bsp/conf/machine/include/am65xx.inc | 2 ++
 meta-ti-bsp/conf/machine/include/j7200.inc  | 2 ++
 meta-ti-bsp/conf/machine/include/j721e.inc  | 6 ++++--
 meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++--
 meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ++++--
 meta-ti-bsp/conf/machine/include/k3.inc     | 1 -
 meta-ti-bsp/conf/machine/j721s2-evm.conf    | 1 -
 meta-ti-bsp/conf/machine/j784s4-evm.conf    | 4 ----
 9 files changed, 17 insertions(+), 12 deletions(-)
meta-ti-bsp/conf/machine/include/am64xx.inc +1 -0
index 7c46b630..f1a91991 100644
@@ -32,4 +32,5 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
+
 OPTEEMACHINE = "k3-am64x"
meta-ti-bsp/conf/machine/include/am65xx.inc +2 -0
index 14e0d07f..88259717 100644
@@ -37,4 +37,6 @@ IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
 do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
+TFA_BOARD = "generic"
+
 OPTEEMACHINE = "k3-am65x"
meta-ti-bsp/conf/machine/include/j7200.inc +2 -0
index 1eaf7806..d21e26cc 100644
@@ -1,4 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j7200"
 
+TFA_BOARD = "generic"
+
 OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/j721e.inc +4 -2
index 34569a01..12ee0c90 100644
@@ -1,8 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721e"
 
-OPTEEMACHINE = "k3-j721e"
-
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "generic"
+
+OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/j721s2.inc +4 -2
index 2a60458e..fc6493b8 100644
@@ -1,8 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721s2"
 
-OPTEEMACHINE = "k3-j721e"
-
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "generic"
+
+OPTEEMACHINE = "k3-j784s4"
meta-ti-bsp/conf/machine/include/j784s4.inc +4 -2
index e2f053ac..d268b810 100644
@@ -1,8 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j784s4"
 
-OPTEEMACHINE = "k3-j721e"
-
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "j784s4"
+
+OPTEEMACHINE = "k3-j784s4"
meta-ti-bsp/conf/machine/include/k3.inc +0 -1
index 84afd2e2..bd71becf 100644
@@ -29,7 +29,6 @@ UBOOT_SUFFIX = "img"
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
 TFA_PLATFORM = "k3"
-TFA_BOARD = "generic"
 
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -1
index 37353df4..46d5dbf6 100644
@@ -7,7 +7,6 @@ require conf/machine/include/j721s2.inc
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
 OPTEE_K3_USART = "0x8"
 
 KERNEL_DEVICETREE = " \
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -4
index 10d8aad0..f8be7d18 100644
@@ -7,7 +7,6 @@ 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 = " \
@@ -18,6 +17,3 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "j784s4"
-
Signature · 1 line
2.38.1
#12 lore raw

PATCH 7/7 conf: machine: Rework do_image_wic dependencies

In reply to Andrew Davis

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

---
 meta-ti-bsp/conf/machine/include/am62xx.inc   |  3 ---
 meta-ti-bsp/conf/machine/include/am64xx.inc   |  8 +++-----
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/j721e.inc    | 11 +++++++++++
 meta-ti-bsp/conf/machine/include/k3.inc       |  3 +--
 meta-ti-bsp/conf/machine/include/omap-a15.inc |  2 +-
 meta-ti-bsp/conf/machine/include/ti43x.inc    |  2 +-
 meta-ti-bsp/conf/machine/j7200-evm.conf       |  3 ---
 meta-ti-bsp/conf/machine/j721e-evm.conf       |  3 ---
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf    |  7 -------
 meta-ti-bsp/conf/machine/j721s2-evm.conf      |  3 ---
 meta-ti-bsp/conf/machine/j784s4-evm.conf      |  3 ---
 12 files changed, 22 insertions(+), 36 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -3
index 9d8bc87c..411e5265 100644
@@ -12,9 +12,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
-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"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
meta-ti-bsp/conf/machine/include/am64xx.inc +3 -5
index f1a91991..0fd15b90 100644
@@ -17,19 +17,17 @@ KERNEL_DEVICETREE = " \
 # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
 BBMULTICONFIG = "k3r5-sr2-hs-fs"
 do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
 BBMULTICONFIG += "k3r5-gp"
-IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
 do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
 BBMULTICONFIG += "k3r5-sr2-hs-se"
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 
 TFA_BOARD = "lite"
 
meta-ti-bsp/conf/machine/include/am65xx.inc +5 -5
index 88259717..424864d3 100644
@@ -26,17 +26,17 @@ KERNEL_DEVICETREE = " \
     ti/k3-am654-evm-ov5640.dtbo \
 "
 
-BBMULTICONFIG += "k3r5-sr2"
+# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+# Default sysfw.itb on AM65x is for SR2.0
+BBMULTICONFIG += "k3r5-sr2"
+do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES += "sysfw.itb"
 
 # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
 IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
 
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-am65x"
meta-ti-bsp/conf/machine/include/j721e.inc +11 -0
index 12ee0c90..6322fe46 100644
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/k3.inc +1 -2
index bd71becf..a34b67ff 100644
@@ -47,7 +47,6 @@ MACHINE_FEATURES += "efi"
 
 WKS_FILE ?= "sdimage-2part-efi.wks"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
+do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index f548f3fd..0843fb28 100644
@@ -50,4 +50,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc +1 -1
index 5509a54d..74a964db 100644
@@ -59,4 +59,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/j7200-evm.conf +0 -3
index 303ec182..33c39a52 100644
@@ -12,6 +12,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j7200_evm_a72_config"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
 KERNEL_DEVICETREE = " \
     ti/k3-j721e-common-proc-board.dtb \
     ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
 SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -3
index 46d5dbf6..3576414d 100644
@@ -15,6 +15,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -3
index f8be7d18..73f3eb8c 100644
@@ -14,6 +14,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
Signature · 1 line
2.38.1
#22 lore raw
In reply to Andrew Davis

Finally was able to spend some time reviewing this patchset - see comments to individual patches.

Quoted 19 lines · Andrew Davis via lists.yoctoproject.org

Multi-cert is already now the default, no need to add a comment on that.

---
 meta-ti-bsp/conf/machine/include/j7.inc | 2 --
 1 file changed, 2 deletions(-)
meta-ti-bsp/conf/machine/include/j7.inc +0 -2
index 4ea3a5d8..cf4cc440 100644
@@ -3,5 +3,3 @@ SOC_FAMILY:append = ":j7"
 
 OPTEEMACHINE = "k3-j721e"
 OPTEEOUTPUTMACHINE = "k3"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
Signature · 1 line
2.38.1
#13 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

In reply to Andrew Davis
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

I'd like to suggest a bit more detailed commenting around the depends and mcdepends and boot files, especially with this cleanup. Specifically mention second/third stage bootloaders and FWs, e.g. R5 SPL vs. A53/A72 SPL vs. A53/A72 U-boot vs. TI-SCI when pulling dependencies - tiboot3.bin, sysfw.itb, tispl.bin, u-boot.img and where they all come from. It's getting harder and harder for an average user/developer to follow all these details with every new K3 SOC release... :)

Quoted 5 lines

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

Funny that Ryan and I just discussed this usage of do_image_wic and do_iamge_tar in another thread (and I haven't yet had time to review this series) and I was thinking that indeed we don't really need do_image_tar at all, while do_image_wic is rather important.

Quoted 203 lines
---
 meta-ti-bsp/conf/machine/include/am62xx.inc   |  3 ---
 meta-ti-bsp/conf/machine/include/am64xx.inc   |  8 +++-----
 meta-ti-bsp/conf/machine/include/am65xx.inc   | 10 +++++-----
 meta-ti-bsp/conf/machine/include/j721e.inc    | 11 +++++++++++
 meta-ti-bsp/conf/machine/include/k3.inc       |  3 +--
 meta-ti-bsp/conf/machine/include/omap-a15.inc |  2 +-
 meta-ti-bsp/conf/machine/include/ti43x.inc    |  2 +-
 meta-ti-bsp/conf/machine/j7200-evm.conf       |  3 ---
 meta-ti-bsp/conf/machine/j721e-evm.conf       |  3 ---
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf    |  7 -------
 meta-ti-bsp/conf/machine/j721s2-evm.conf      |  3 ---
 meta-ti-bsp/conf/machine/j784s4-evm.conf      |  3 ---
 12 files changed, 22 insertions(+), 36 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -3
index 9d8bc87c..411e5265 100644
@@ -12,9 +12,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
-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"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
meta-ti-bsp/conf/machine/include/am64xx.inc +3 -5
index f1a91991..0fd15b90 100644
@@ -17,19 +17,17 @@ KERNEL_DEVICETREE = " \
 # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
 BBMULTICONFIG = "k3r5-sr2-hs-fs"
 do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
 BBMULTICONFIG += "k3r5-gp"
-IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
 do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
 BBMULTICONFIG += "k3r5-sr2-hs-se"
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 
 TFA_BOARD = "lite"
 
meta-ti-bsp/conf/machine/include/am65xx.inc +5 -5
index 88259717..424864d3 100644
@@ -26,17 +26,17 @@ KERNEL_DEVICETREE = " \
     ti/k3-am654-evm-ov5640.dtbo \
 "
 
-BBMULTICONFIG += "k3r5-sr2"
+# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+# Default sysfw.itb on AM65x is for SR2.0
+BBMULTICONFIG += "k3r5-sr2"
+do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES += "sysfw.itb"
 
 # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
 IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
 
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-am65x"
meta-ti-bsp/conf/machine/include/j721e.inc +11 -0
index 12ee0c90..6322fe46 100644
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/k3.inc +1 -2
index bd71becf..a34b67ff 100644
@@ -47,7 +47,6 @@ MACHINE_FEATURES += "efi"
 
 WKS_FILE ?= "sdimage-2part-efi.wks"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
+do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index f548f3fd..0843fb28 100644
@@ -50,4 +50,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc +1 -1
index 5509a54d..74a964db 100644
@@ -59,4 +59,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
 IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/j7200-evm.conf +0 -3
index 303ec182..33c39a52 100644
@@ -12,6 +12,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j7200_evm_a72_config"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
 KERNEL_DEVICETREE = " \
     ti/k3-j721e-common-proc-board.dtb \
     ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
 SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -3
index 46d5dbf6..3576414d 100644
@@ -15,6 +15,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -3
index f8be7d18..73f3eb8c 100644
@@ -14,6 +14,3 @@ KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
Signature · 1 line
2.38.1
#3 lore raw

Re: [meta-ti][master/kirkstone][PATCH 3/7] conf: machine: Use new J7 SoC names over specific board names

In reply to Andrew Davis
Quoted 10 lines · Andrew Davis via lists.yoctoproject.org

Now that we have SoC names, we can avoid adding features based on the board name. We expect folks to create their own boards based on these SoCs, and so using the TI made EVM board name everywhere adds extra churn when adding a new board. Plus it is more correct for most of these features as they depend on the SoC, not on the EVM board.

One other thing we do here is to not use the generic "j7" name, the current and future J7 devices are far to feature diverse to group at this level. Grouping like that will lead to the wrong things getting enabled as new J7 SoCs are added.

Heh, I had most of these similar cleanup changes already staged locally since my last sync-up with Dunfell, but didn't have time to finish them and submit.

Quoted 137 lines
---
 .../cnm-wave-fw/cnm-wave-fw_git.bb            |  3 +-
 .../ti-img-encode-decode/vxd-dec-fw_git.bb    |  2 +-
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  |  5 ++-
 .../recipes-kernel/linux/kernel-rdepends.inc  |  2 +-
 .../linux/linux-ti-staging_5.10.bb            |  2 +-
 .../ti-rtos-bin/ti-rtos-firmware.bb           | 39 +++++++++----------
 .../ti-rtos-bin/ti-rtos-metadata.bb           |  6 +--
 .../recipes-bsp/pru/pru-icss_git.bb           | 10 ++---
 8 files changed, 34 insertions(+), 35 deletions(-)
meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +1 -2
index 0e8ed897..e7aa9ef4 100644
@@ -27,8 +27,7 @@ ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm
 ALTERNATIVE_PRIORITY = "10"
 
 # Set up names for the firmwares
-ALTERNATIVE_${PN}:j7 = "\
-                    wave521c_codec_fw.bin"
+ALTERNATIVE_${PN} = "wave521c_codec_fw.bin"
 
 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/cnm
meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb +1 -1
index 7727e9af..bd103198 100644
@@ -9,7 +9,7 @@ PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j721e"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +4 -1
index 5127e137..6f5b6313 100644
@@ -32,7 +32,10 @@ PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/b
 PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE},,ti-rtos-firmware"
 
 PACKAGECONFIG:append:aarch64 = " atf optee"
-PACKAGECONFIG:append:j7 = " dm"
+PACKAGECONFIG:append:j721e = " dm"
+PACKAGECONFIG:append:j7200 = " dm"
+PACKAGECONFIG:append:j721s2 = " dm"
+PACKAGECONFIG:append:j784s4 = " dm"
 PACKAGECONFIG:append:am62xx = " dm"
 
 COMPATIBLE_MACHINE = "(ti-soc)"
meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +1 -1
index 43cd31fe..54e6fdc6 100644
@@ -26,7 +26,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw"
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cadence-mhdp-fw"
 
 # Add run-time dependency for Video Decoding firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw"
+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"
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +1 -1
index bf230dbc..67b28b2a 100644
@@ -42,4 +42,4 @@ module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
 module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
 module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
 KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
-KERNEL_MODULE_AUTOLOAD:append:j7 = " rpmsg_kdrv_switch"
+KERNEL_MODULE_AUTOLOAD:append:j721e = " rpmsg_kdrv_switch"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +8 -11
index 0447bafe..9a6da088 100644
@@ -13,13 +13,10 @@ inherit deploy
 inherit update-alternatives
 
 PLAT_SFX = ""
-PLAT_SFX:j7 = "j721e"
-PLAT_SFX:j721e-hs-evm = "j721e"
-PLAT_SFX:j7200-evm = "j7200"
-PLAT_SFX:j7200-hs-evm = "j7200"
-PLAT_SFX:j721s2-evm = "j721s2"
-PLAT_SFX:j721s2-hs-evm = "j721s2"
-PLAT_SFX:j784s4-evm = "j784s4"
+PLAT_SFX:j721e = "j721e"
+PLAT_SFX:j7200 = "j7200"
+PLAT_SFX:j721s2 = "j721s2"
+PLAT_SFX:j784s4 = "j784s4"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
@@ -50,7 +47,7 @@ LEGACY_DM_FW_DIR  = "${D}${nonarch_base_libdir}/firmware/pdk-ipc/"
 
 DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
 
-# J7 HS support
+# J721e HS support
 do_install:prepend:j721e-hs-evm() {
         export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
         ( cd ${RTOS_DM_FW_DIR}; \
@@ -81,7 +78,7 @@ do_install:prepend:j721e-hs-evm() {
         )
 }
 
-# J7 HS support
+# J7200 HS support
 do_install:prepend:j7200-hs-evm() {
         export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
         ( cd ${RTOS_DM_FW_DIR}; \
@@ -102,7 +99,7 @@ do_install:prepend:j7200-hs-evm() {
         )
 }
 
-# J7 HS support
+# J721s2 HS support
 do_install:prepend:j721s2-hs-evm() {
         export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
         ( cd ${RTOS_DM_FW_DIR}; \
@@ -149,7 +146,7 @@ do_install() {
 	:
 }
 
-do_install:j7() {
+do_install:j721e() {
     install -d ${LEGACY_IPC_FW_DIR}
     install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
     install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}

meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb ALTERNATIVE:${PN}:j721e-hs-evm = "\ · line 335

Quoted 5 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +1 -1
@@ -335,7 +332,7 @@ ALTERNATIVE:${PN}:j721e-hs-evm = "\
                     j7-c71_0-fw-sec \
                     "
 
-ALTERNATIVE:${PN}:j7 = "\
+ALTERNATIVE:${PN}:j721e-evm = "\

Should this be a common list for all j721e platforms, not just the EVM?

Quoted 33 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +9 -9
                     j7-mcu-r5f0_0-fw \
                     j7-mcu-r5f0_1-fw \
                     j7-main-r5f0_0-fw \
@@ -420,15 +417,15 @@ TARGET_MCU_M4FSS0_0:am64xx = "am64-mcu-m4f0_0-fw"
 TARGET_MAIN_R5FSS0_0:am62xx = "am62-main-r5f0_0-fw"
 TARGET_MCU_M4FSS0_0:am62xx = "am62-mcu-m4f0_0-fw"
 
-TARGET_MCU_R5FSS0_0:j7 = "j7-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1:j7 = "j7-mcu-r5f0_1-fw"
-TARGET_MAIN_R5FSS0_0:j7 = "j7-main-r5f0_0-fw"
-TARGET_MAIN_R5FSS0_1:j7 = "j7-main-r5f0_1-fw"
-TARGET_MAIN_R5FSS1_0:j7 = "j7-main-r5f1_0-fw"
-TARGET_MAIN_R5FSS1_1:j7 = "j7-main-r5f1_1-fw"
-TARGET_C66_0:j7 = "j7-c66_0-fw"
-TARGET_C66_1:j7 = "j7-c66_1-fw"
-TARGET_C7X_0:j7 = "j7-c71_0-fw"
+TARGET_MCU_R5FSS0_0:j721e = "j7-mcu-r5f0_0-fw"
+TARGET_MCU_R5FSS0_1:j721e = "j7-mcu-r5f0_1-fw"
+TARGET_MAIN_R5FSS0_0:j721e = "j7-main-r5f0_0-fw"
+TARGET_MAIN_R5FSS0_1:j721e = "j7-main-r5f0_1-fw"
+TARGET_MAIN_R5FSS1_0:j721e = "j7-main-r5f1_0-fw"
+TARGET_MAIN_R5FSS1_1:j721e = "j7-main-r5f1_1-fw"
+TARGET_C66_0:j721e = "j7-c66_0-fw"
+TARGET_C66_1:j721e = "j7-c66_1-fw"
+TARGET_C7X_0:j721e = "j7-c71_0-fw"
 
 TARGET_MAIN_R5FSS0_0_SIGNED:j721e-hs-evm = "j7-main-r5f0_0-fw-sec"
 TARGET_MAIN_R5FSS0_1_SIGNED:j721e-hs-evm = "j7-main-r5f0_1-fw-sec"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +0 -0
index be1ff013..ff715ce0 100644

meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb line 4

Quoted 5 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +1 -1
@@ -1,7 +1,7 @@
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
-COMPATIBLE_MACHINE = "ti-soc"
+COMPATIBLE_MACHINE = "j721e|j7200|am65xx|am64xx"

Why?

meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb INHIBIT_DEFAULT_DEPS = "1" · line 16

Quoted 12 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +2 -2
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -10,8 +10,8 @@ INHIBIT_DEFAULT_DEPS = "1"
 inherit nopackages deploy
 
 PLAT_SFX = ""
-PLAT_SFX:j7 = "/j721e"
-PLAT_SFX:j7200-evm = "/j7200"
+PLAT_SFX:j721e = "/j721e"
+PLAT_SFX:j7200 = "/j7200"
 PLAT_SFX:am65xx = "/am65xx"
 PLAT_SFX:am64xx = "/am64x"

This list seems incomplete. The whole concept of ti-rtos-metadata got shifted towards using ti-linux-firmware and probably needs a deeper cleanup.

meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb PR = "r0" · line 18

Quoted 10 lines
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +1 -1
index cb2f8cc2..e3b5290a 100644
@@ -15,7 +15,7 @@ PR = "r0"
 
 require recipes-ti/includes/ti-paths.inc
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am62xx|am64xx|am65xx|j721e"

Should this be a separate commit? The below does cleanup j721e usage, but a stricter COMPATIBLE_MACHINE should probably have a dedicated explanation? Are these restrictions due to HW specifics or simply SW enablement?

Quoted 41 lines
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +4 -4
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES:prepend = " \
@@ -43,7 +43,7 @@ PLATFORM:omap-a15 = "am572x"
 PLATFORM:am62xx = "am62x"
 PLATFORM:am64xx = "am64x"
 PLATFORM:am65xx = "am65x"
-PLATFORM:j7 = "j721e"
+PLATFORM:j721e = "j721e"
 
 do_compile() {
     for dir in ${SUBDIRS}
@@ -155,7 +155,7 @@ do_install:append:am65xx() {
     done
 }
 
-do_install:append:j7() {
+do_install:append:j721e() {
     for i in 0 1
     do
         install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
@@ -189,7 +189,7 @@ PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_
 PRU_ICSS_ALTERNATIVES:am62xx   = "am62x-pru0-fw am62x-pru1-fw"
 PRU_ICSS_ALTERNATIVES:am64xx   = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
 PRU_ICSS_ALTERNATIVES:am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
-PRU_ICSS_ALTERNATIVES:j7       = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
+PRU_ICSS_ALTERNATIVES:j721e    = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
 
 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/am335x-pru0-fw"
@@ -259,7 +259,7 @@ ALTERNATIVE:pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
 # Only Halt firmware images are supported for the Tx_PRU cores
 ALTERNATIVE:pru-icss-halt:append:am64xx = " am64x-txpru0_0-fw am64x-txpru0_1-fw am64x-txpru1_0-fw am64x-txpru1_1-fw"
 ALTERNATIVE:pru-icss-halt:append:am65xx = " am65x-txpru0_0-fw am65x-txpru0_1-fw am65x-txpru1_0-fw am65x-txpru1_1-fw am65x-txpru2_0-fw am65x-txpru2_1-fw"
-ALTERNATIVE:pru-icss-halt:append:j7 = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"
+ALTERNATIVE:pru-icss-halt:append:j721e  = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"
 
 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out"
 ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out"
Signature · 1 line
2.38.1
#7 lore raw

Re: [meta-ti][master/kirkstone][PATCH 5/7] conf: machine: Remove OPTEEOUTPUTMACHINE definition

In reply to Andrew Davis
Quoted 2 lines · Andrew Davis via lists.yoctoproject.org

This was used in the base Linaro optee-os_git.bb recipe, it is no longer used, remove it from our boards.

Well, it was still used in meta-arm up to and including Dunfell:
https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os_git.bb?h=dunfell#n57

Even though it got removed after Dunfell, there's one small reference remaining in meta-arago, which I assume you'd be taking care of next? :)
https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk.bb#n30

Quoted 123 lines
---
 meta-ti-bsp/conf/machine/am437x-hs-evm.conf | 1 -
 meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | 1 -
 meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | 1 -
 meta-ti-bsp/conf/machine/include/am62xx.inc | 1 -
 meta-ti-bsp/conf/machine/include/am64xx.inc | 1 -
 meta-ti-bsp/conf/machine/include/am65xx.inc | 1 -
 meta-ti-bsp/conf/machine/include/j7200.inc  | 1 -
 meta-ti-bsp/conf/machine/include/j721e.inc  | 1 -
 meta-ti-bsp/conf/machine/include/j721s2.inc | 1 -
 meta-ti-bsp/conf/machine/include/j784s4.inc | 1 -
 10 files changed, 10 deletions(-)
meta-ti-bsp/conf/machine/am437x-hs-evm.conf +0 -1
index 68b808d2..cdd664ac 100644
@@ -15,6 +15,5 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
 
 OPTEEMACHINE = "ti-am43xx"
 OPTEEFLAVOR = "am43xx"
-OPTEEOUTPUTMACHINE = "ti"
 
 EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +0 -1
index 5232cbd9..1e63f5d2 100644
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
 
 OPTEEMACHINE = "ti-am57xx"
 OPTEEFLAVOR = "am57xx"
-OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"
 
 EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +0 -1
index 49630081..810d53ed 100644
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
 
 OPTEEMACHINE = "ti-dra7xx"
 OPTEEFLAVOR = "dra7xx"
-OPTEEOUTPUTMACHINE = "ti"
 OPTEEPAGER = "y"
 
 EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -1
index a5aad994..9d8bc87c 100644
@@ -19,4 +19,3 @@ TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
 OPTEEMACHINE = "k3-am62x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/am64xx.inc +0 -1
index 055f6036..7c46b630 100644
@@ -33,4 +33,3 @@ do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am64x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/am65xx.inc +0 -1
index 80aa6d27..14e0d07f 100644
@@ -38,4 +38,3 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
 OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j7200.inc +0 -1
index 3aedb3f8..1eaf7806 100644
@@ -2,4 +2,3 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j7200"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j721e.inc +0 -1
index 8a6c2bec..34569a01 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721e"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
 MACHINE_FEATURES += "gpu"
 
meta-ti-bsp/conf/machine/include/j721s2.inc +0 -1
index 4959ad8f..2a60458e 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721s2"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
 MACHINE_FEATURES += "gpu"
 
meta-ti-bsp/conf/machine/include/j784s4.inc +0 -1
index 83d7c760..e2f053ac 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j784s4"
 
 OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
 MACHINE_FEATURES += "gpu"
 
Signature · 1 line
2.38.1
#10 lore raw

Re: [meta-ti][master/kirkstone][PATCH 6/7] conf: machine: Move TFA_BOARD and OPTEEMACHINE to the SoC level

In reply to Andrew Davis
Quoted 3 lines · Andrew Davis via lists.yoctoproject.org

These defines are specific to a SoC, not a SoC family (K3) nor any specific board. Move these to the SoC level for all boards to be consistent with boards already doing this correctly.

See the question below

Quoted 101 lines
---
 meta-ti-bsp/conf/machine/include/am64xx.inc | 1 +
 meta-ti-bsp/conf/machine/include/am65xx.inc | 2 ++
 meta-ti-bsp/conf/machine/include/j7200.inc  | 2 ++
 meta-ti-bsp/conf/machine/include/j721e.inc  | 6 ++++--
 meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++--
 meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ++++--
 meta-ti-bsp/conf/machine/include/k3.inc     | 1 -
 meta-ti-bsp/conf/machine/j721s2-evm.conf    | 1 -
 meta-ti-bsp/conf/machine/j784s4-evm.conf    | 4 ----
 9 files changed, 17 insertions(+), 12 deletions(-)
meta-ti-bsp/conf/machine/include/am64xx.inc +1 -0
index 7c46b630..f1a91991 100644
@@ -32,4 +32,5 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
+
 OPTEEMACHINE = "k3-am64x"
meta-ti-bsp/conf/machine/include/am65xx.inc +2 -0
index 14e0d07f..88259717 100644
@@ -37,4 +37,6 @@ IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
 do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
+TFA_BOARD = "generic"
+
 OPTEEMACHINE = "k3-am65x"
meta-ti-bsp/conf/machine/include/j7200.inc +2 -0
index 1eaf7806..d21e26cc 100644
@@ -1,4 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j7200"
 
+TFA_BOARD = "generic"
+
 OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/j721e.inc +4 -2
index 34569a01..12ee0c90 100644
@@ -1,8 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721e"
 
-OPTEEMACHINE = "k3-j721e"
-
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "generic"
+
+OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/j721s2.inc +4 -2
index 2a60458e..fc6493b8 100644
@@ -1,8 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j721s2"
 
-OPTEEMACHINE = "k3-j721e"
-
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "generic"
+
+OPTEEMACHINE = "k3-j784s4"
meta-ti-bsp/conf/machine/include/j784s4.inc +0 -2
index e2f053ac..d268b810 100644
@@ -1,8 +1,6 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j784s4"
 
-OPTEEMACHINE = "k3-j721e"
-
 MACHINE_FEATURES += "gpu"
 
 PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"

meta-ti-bsp/conf/machine/include/j784s4.inc PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" · line 12

Quoted 5 lines
meta-ti-bsp/conf/machine/include/j784s4.inc +2 -0
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "j784s4"

Just wanted to check that it is the correct TFA_BOARD used here. I know that you are simply moving the existing value from EVM to SOC config, but I still wonder that we have these inconsistent values for all the K3 platforms:

1. generic
2. lite
3. j784s4

Quoted 48 lines
meta-ti-bsp/conf/machine/include/j784s4.inc +2 -0
+
+OPTEEMACHINE = "k3-j784s4"
meta-ti-bsp/conf/machine/include/k3.inc +0 -1
index 84afd2e2..bd71becf 100644
@@ -29,7 +29,6 @@ UBOOT_SUFFIX = "img"
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
 TFA_PLATFORM = "k3"
-TFA_BOARD = "generic"
 
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -1
index 37353df4..46d5dbf6 100644
@@ -7,7 +7,6 @@ require conf/machine/include/j721s2.inc
 SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
 OPTEE_K3_USART = "0x8"
 
 KERNEL_DEVICETREE = " \
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -4
index 10d8aad0..f8be7d18 100644
@@ -7,7 +7,6 @@ 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 = " \
@@ -18,6 +17,3 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "j784s4"
-
Signature · 1 line
2.38.1
#14 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

In reply to Denys Dmytriyenko
Quoted 6 lines · Denys Dmytriyenko
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

Quoted 8 lines

I'd like to suggest a bit more detailed commenting around the depends and mcdepends and boot files, especially with this cleanup. Specifically mention second/third stage bootloaders and FWs, e.g. R5 SPL vs. A53/A72 SPL vs. A53/A72 U-boot vs. TI-SCI when pulling dependencies - tiboot3.bin, sysfw.itb, tispl.bin, u-boot.img and where they all come from. It's getting harder and harder for an average user/developer to follow all these details with every new K3 SOC release... :)

I did add some extra comments, and this patch hopefully organizes things in a way that makes them easier to understand. Agree the amount of bits needed to boot K3 is more than ideal, moving the FW into the U-Boot build (binman) should clean up some of this. Not sure when that will land, but when it does we can give this another round of cleanup.

Maybe some readme is needed? Seems outside the scope of this patch though.

Quoted 12 lines
Quoted 6 lines

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

Funny that Ryan and I just discussed this usage of do_image_wic and do_iamge_tar in another thread (and I haven't yet had time to review this series) and I was thinking that indeed we don't really need do_image_tar at all, while do_image_wic is rather important.

I saw that, seems we need just _wic and _ext now? Or some better way of letting the build know when we need our bootloader. I have no good solution right now.

Andrew

Quoted 204 lines
Quoted 204 lines
---
  meta-ti-bsp/conf/machine/include/am62xx.inc   |  3 ---
  meta-ti-bsp/conf/machine/include/am64xx.inc   |  8 +++-----
  meta-ti-bsp/conf/machine/include/am65xx.inc   | 10 +++++-----
  meta-ti-bsp/conf/machine/include/j721e.inc    | 11 +++++++++++
  meta-ti-bsp/conf/machine/include/k3.inc       |  3 +--
  meta-ti-bsp/conf/machine/include/omap-a15.inc |  2 +-
  meta-ti-bsp/conf/machine/include/ti43x.inc    |  2 +-
  meta-ti-bsp/conf/machine/j7200-evm.conf       |  3 ---
  meta-ti-bsp/conf/machine/j721e-evm.conf       |  3 ---
  meta-ti-bsp/conf/machine/j721e-hs-evm.conf    |  7 -------
  meta-ti-bsp/conf/machine/j721s2-evm.conf      |  3 ---
  meta-ti-bsp/conf/machine/j784s4-evm.conf      |  3 ---
  12 files changed, 22 insertions(+), 36 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -3
index 9d8bc87c..411e5265 100644
@@ -12,9 +12,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
-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"
  TFA_K3_SYSTEM_SUSPEND = "1"
 
meta-ti-bsp/conf/machine/include/am64xx.inc +3 -5
index f1a91991..0fd15b90 100644
@@ -17,19 +17,17 @@ KERNEL_DEVICETREE = " \
  # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
  BBMULTICONFIG = "k3r5-sr2-hs-fs"
  do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
 
  # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
  BBMULTICONFIG += "k3r5-gp"
-IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
  do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
 
  # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
  BBMULTICONFIG += "k3r5-sr2-hs-se"
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
  do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 
  TFA_BOARD = "lite"
 
meta-ti-bsp/conf/machine/include/am65xx.inc +5 -5
index 88259717..424864d3 100644
@@ -26,17 +26,17 @@ KERNEL_DEVICETREE = " \
      ti/k3-am654-evm-ov5640.dtbo \
  "
 
-BBMULTICONFIG += "k3r5-sr2"
+# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+# Default sysfw.itb on AM65x is for SR2.0
+BBMULTICONFIG += "k3r5-sr2"
+do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
  IMAGE_BOOT_FILES += "sysfw.itb"
 
  # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
  IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
 
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
  TFA_BOARD = "generic"
 
  OPTEEMACHINE = "k3-am65x"
meta-ti-bsp/conf/machine/include/j721e.inc +11 -0
index 12ee0c90..6322fe46 100644
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
  TFA_BOARD = "generic"
 
  OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/k3.inc +1 -2
index bd71becf..a34b67ff 100644
@@ -47,7 +47,6 @@ MACHINE_FEATURES += "efi"
 
  WKS_FILE ?= "sdimage-2part-efi.wks"
  do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
+do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
 
  TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index f548f3fd..0843fb28 100644
@@ -50,4 +50,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
  IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
  WKS_FILE ?= "sdimage-2part.wks"
  IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/include/ti43x.inc +1 -1
index 5509a54d..74a964db 100644
@@ -59,4 +59,4 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne
  IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
  WKS_FILE ?= "sdimage-2part.wks"
  IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
meta-ti-bsp/conf/machine/j7200-evm.conf +0 -3
index 303ec182..33c39a52 100644
@@ -12,6 +12,3 @@ KERNEL_DEVICETREE = " \
  "
 
  UBOOT_MACHINE = "j7200_evm_a72_config"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
  SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
  KERNEL_DEVICETREE = " \
      ti/k3-j721e-common-proc-board.dtb \
      ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
  UBOOT_BINARY = "u-boot.img_HS"
  UBOOT_SYMLINK = "u-boot.img"
  SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -3
index 46d5dbf6..3576414d 100644
@@ -15,6 +15,3 @@ KERNEL_DEVICETREE = " \
  "
 
  UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -3
index f8be7d18..73f3eb8c 100644
@@ -14,6 +14,3 @@ KERNEL_DEVICETREE = " \
  "
 
  UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
Signature · 1 line
2.38.1
#4 lore raw

Re: [meta-ti][master/kirkstone][PATCH 3/7] conf: machine: Use new J7 SoC names over specific board names

In reply to Denys Dmytriyenko
Quoted 156 lines · Denys Dmytriyenko
Quoted 10 lines · Andrew Davis via lists.yoctoproject.org

Now that we have SoC names, we can avoid adding features based on the board name. We expect folks to create their own boards based on these SoCs, and so using the TI made EVM board name everywhere adds extra churn when adding a new board. Plus it is more correct for most of these features as they depend on the SoC, not on the EVM board.

One other thing we do here is to not use the generic "j7" name, the current and future J7 devices are far to feature diverse to group at this level. Grouping like that will lead to the wrong things getting enabled as new J7 SoCs are added.

Heh, I had most of these similar cleanup changes already staged locally since my last sync-up with Dunfell, but didn't have time to finish them and submit.

Quoted 140 lines
---
  .../cnm-wave-fw/cnm-wave-fw_git.bb            |  3 +-
  .../ti-img-encode-decode/vxd-dec-fw_git.bb    |  2 +-
  meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  |  5 ++-
  .../recipes-kernel/linux/kernel-rdepends.inc  |  2 +-
  .../linux/linux-ti-staging_5.10.bb            |  2 +-
  .../ti-rtos-bin/ti-rtos-firmware.bb           | 39 +++++++++----------
  .../ti-rtos-bin/ti-rtos-metadata.bb           |  6 +--
  .../recipes-bsp/pru/pru-icss_git.bb           | 10 ++---
  8 files changed, 34 insertions(+), 35 deletions(-)
meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +1 -2
index 0e8ed897..e7aa9ef4 100644
@@ -27,8 +27,7 @@ ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm
  ALTERNATIVE_PRIORITY = "10"
 
  # Set up names for the firmwares
-ALTERNATIVE_${PN}:j7 = "\
-                    wave521c_codec_fw.bin"
+ALTERNATIVE_${PN} = "wave521c_codec_fw.bin"
 
  do_install() {
  	install -d ${D}${nonarch_base_libdir}/firmware/cnm
meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb +1 -1
index 7727e9af..bd103198 100644
@@ -9,7 +9,7 @@ PR = "${INC_PR}.0"
 
  CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j721e"
 
  PACKAGE_ARCH = "${MACHINE_ARCH}"
 
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +4 -1
index 5127e137..6f5b6313 100644
@@ -32,7 +32,10 @@ PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/b
  PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE},,ti-rtos-firmware"
 
  PACKAGECONFIG:append:aarch64 = " atf optee"
-PACKAGECONFIG:append:j7 = " dm"
+PACKAGECONFIG:append:j721e = " dm"
+PACKAGECONFIG:append:j7200 = " dm"
+PACKAGECONFIG:append:j721s2 = " dm"
+PACKAGECONFIG:append:j784s4 = " dm"
  PACKAGECONFIG:append:am62xx = " dm"
 
  COMPATIBLE_MACHINE = "(ti-soc)"
meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +1 -1
index 43cd31fe..54e6fdc6 100644
@@ -26,7 +26,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw"
  RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cadence-mhdp-fw"
 
  # Add run-time dependency for Video Decoding firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw"
+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"
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +1 -1
index bf230dbc..67b28b2a 100644
@@ -42,4 +42,4 @@ module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
  module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
  module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
  KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
-KERNEL_MODULE_AUTOLOAD:append:j7 = " rpmsg_kdrv_switch"
+KERNEL_MODULE_AUTOLOAD:append:j721e = " rpmsg_kdrv_switch"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +8 -11
index 0447bafe..9a6da088 100644
@@ -13,13 +13,10 @@ inherit deploy
  inherit update-alternatives
 
  PLAT_SFX = ""
-PLAT_SFX:j7 = "j721e"
-PLAT_SFX:j721e-hs-evm = "j721e"
-PLAT_SFX:j7200-evm = "j7200"
-PLAT_SFX:j7200-hs-evm = "j7200"
-PLAT_SFX:j721s2-evm = "j721s2"
-PLAT_SFX:j721s2-hs-evm = "j721s2"
-PLAT_SFX:j784s4-evm = "j784s4"
+PLAT_SFX:j721e = "j721e"
+PLAT_SFX:j7200 = "j7200"
+PLAT_SFX:j721s2 = "j721s2"
+PLAT_SFX:j784s4 = "j784s4"
  PLAT_SFX:am65xx = "am65xx"
  PLAT_SFX:am64xx = "am64xx"
  PLAT_SFX:am62xx = "am62xx"
@@ -50,7 +47,7 @@ LEGACY_DM_FW_DIR  = "${D}${nonarch_base_libdir}/firmware/pdk-ipc/"
 
  DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
 
-# J7 HS support
+# J721e HS support
  do_install:prepend:j721e-hs-evm() {
          export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
          ( cd ${RTOS_DM_FW_DIR}; \
@@ -81,7 +78,7 @@ do_install:prepend:j721e-hs-evm() {
          )
  }
 
-# J7 HS support
+# J7200 HS support
  do_install:prepend:j7200-hs-evm() {
          export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
          ( cd ${RTOS_DM_FW_DIR}; \
@@ -102,7 +99,7 @@ do_install:prepend:j7200-hs-evm() {
          )
  }
 
-# J7 HS support
+# J721s2 HS support
  do_install:prepend:j721s2-hs-evm() {
          export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
          ( cd ${RTOS_DM_FW_DIR}; \
@@ -149,7 +146,7 @@ do_install() {
  	:
  }
 
-do_install:j7() {
+do_install:j721e() {
      install -d ${LEGACY_IPC_FW_DIR}
      install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
      install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
@@ -335,7 +332,7 @@ ALTERNATIVE:${PN}:j721e-hs-evm = "\
                      j7-c71_0-fw-sec \
                      "
 
Quoted 5 lines

meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb ALTERNATIVE:${PN}:j721e-hs-evm = "\ · line 335

Quoted 2 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +1 -1
-ALTERNATIVE:${PN}:j7 = "\
+ALTERNATIVE:${PN}:j721e-evm = "\

Should this be a common list for all j721e platforms, not just the EVM?

The problem is the HS firmware (-sec) already listed. But yes the non-signed firmware could be made common, but that would be a different patch.

Quoted 37 lines
Quoted 37 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +9 -9
                      j7-mcu-r5f0_0-fw \
                      j7-mcu-r5f0_1-fw \
                      j7-main-r5f0_0-fw \
@@ -420,15 +417,15 @@ TARGET_MCU_M4FSS0_0:am64xx = "am64-mcu-m4f0_0-fw"
  TARGET_MAIN_R5FSS0_0:am62xx = "am62-main-r5f0_0-fw"
  TARGET_MCU_M4FSS0_0:am62xx = "am62-mcu-m4f0_0-fw"
 
-TARGET_MCU_R5FSS0_0:j7 = "j7-mcu-r5f0_0-fw"
-TARGET_MCU_R5FSS0_1:j7 = "j7-mcu-r5f0_1-fw"
-TARGET_MAIN_R5FSS0_0:j7 = "j7-main-r5f0_0-fw"
-TARGET_MAIN_R5FSS0_1:j7 = "j7-main-r5f0_1-fw"
-TARGET_MAIN_R5FSS1_0:j7 = "j7-main-r5f1_0-fw"
-TARGET_MAIN_R5FSS1_1:j7 = "j7-main-r5f1_1-fw"
-TARGET_C66_0:j7 = "j7-c66_0-fw"
-TARGET_C66_1:j7 = "j7-c66_1-fw"
-TARGET_C7X_0:j7 = "j7-c71_0-fw"
+TARGET_MCU_R5FSS0_0:j721e = "j7-mcu-r5f0_0-fw"
+TARGET_MCU_R5FSS0_1:j721e = "j7-mcu-r5f0_1-fw"
+TARGET_MAIN_R5FSS0_0:j721e = "j7-main-r5f0_0-fw"
+TARGET_MAIN_R5FSS0_1:j721e = "j7-main-r5f0_1-fw"
+TARGET_MAIN_R5FSS1_0:j721e = "j7-main-r5f1_0-fw"
+TARGET_MAIN_R5FSS1_1:j721e = "j7-main-r5f1_1-fw"
+TARGET_C66_0:j721e = "j7-c66_0-fw"
+TARGET_C66_1:j721e = "j7-c66_1-fw"
+TARGET_C7X_0:j721e = "j7-c71_0-fw"
 
  TARGET_MAIN_R5FSS0_0_SIGNED:j721e-hs-evm = "j7-main-r5f0_0-fw-sec"
  TARGET_MAIN_R5FSS0_1_SIGNED:j721e-hs-evm = "j7-main-r5f0_1-fw-sec"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +0 -0
index be1ff013..ff715ce0 100644
@@ -1,7 +1,7 @@
  LICENSE = "BSD-3-Clause"
  LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
Quoted 5 lines

meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb line 4

Quoted 2 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +1 -1
-COMPATIBLE_MACHINE = "ti-soc"
+COMPATIBLE_MACHINE = "j721e|j7200|am65xx|am64xx"

Why?

These are the only ones listed below, if it works on more machines then they will needed added to the PLAT_SFX below.

Quoted 6 lines
Quoted 6 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +0 -0
  PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -10,8 +10,8 @@ INHIBIT_DEFAULT_DEPS = "1"
  inherit nopackages deploy
 
Quoted 11 lines

meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb INHIBIT_DEFAULT_DEPS = "1" · line 16

Quoted 7 lines
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +2 -2
  PLAT_SFX = ""
-PLAT_SFX:j7 = "/j721e"
-PLAT_SFX:j7200-evm = "/j7200"
+PLAT_SFX:j721e = "/j721e"
+PLAT_SFX:j7200 = "/j7200"
  PLAT_SFX:am65xx = "/am65xx"
  PLAT_SFX:am64xx = "/am64x"

This list seems incomplete. The whole concept of ti-rtos-metadata got shifted towards using ti-linux-firmware and probably needs a deeper cleanup.

Was planing on revisiting after this first round of cleanups.

Quoted 7 lines
Quoted 7 lines
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +0 -0
index cb2f8cc2..e3b5290a 100644
@@ -15,7 +15,7 @@ PR = "r0"
 
Quoted 9 lines

meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb PR = "r0" · line 18

Quoted 4 lines
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +1 -1
  require recipes-ti/includes/ti-paths.inc
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am62xx|am64xx|am65xx|j721e"

Should this be a separate commit? The below does cleanup j721e usage, but a stricter COMPATIBLE_MACHINE should probably have a dedicated explanation? Are these restrictions due to HW specifics or simply SW enablement?

Could be a different patch sure, but this does make it clear what plats are actually supported below.

This is hardware specific, only these SoCs have PRUs, the later J7x parts didn't get them.

Andrew

Quoted 42 lines
Quoted 42 lines
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +4 -4
  PACKAGE_ARCH = "${MACHINE_ARCH}"
 
  PACKAGES:prepend = " \
@@ -43,7 +43,7 @@ PLATFORM:omap-a15 = "am572x"
  PLATFORM:am62xx = "am62x"
  PLATFORM:am64xx = "am64x"
  PLATFORM:am65xx = "am65x"
-PLATFORM:j7 = "j721e"
+PLATFORM:j721e = "j721e"
 
  do_compile() {
      for dir in ${SUBDIRS}
@@ -155,7 +155,7 @@ do_install:append:am65xx() {
      done
  }
 
-do_install:append:j7() {
+do_install:append:j721e() {
      for i in 0 1
      do
          install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
@@ -189,7 +189,7 @@ PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_
  PRU_ICSS_ALTERNATIVES:am62xx   = "am62x-pru0-fw am62x-pru1-fw"
  PRU_ICSS_ALTERNATIVES:am64xx   = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
  PRU_ICSS_ALTERNATIVES:am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
-PRU_ICSS_ALTERNATIVES:j7       = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
+PRU_ICSS_ALTERNATIVES:j721e    = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
 
  # Set up link names for the firmwares
  ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/am335x-pru0-fw"
@@ -259,7 +259,7 @@ ALTERNATIVE:pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
  # Only Halt firmware images are supported for the Tx_PRU cores
  ALTERNATIVE:pru-icss-halt:append:am64xx = " am64x-txpru0_0-fw am64x-txpru0_1-fw am64x-txpru1_0-fw am64x-txpru1_1-fw"
  ALTERNATIVE:pru-icss-halt:append:am65xx = " am65x-txpru0_0-fw am65x-txpru0_1-fw am65x-txpru1_0-fw am65x-txpru1_1-fw am65x-txpru2_0-fw am65x-txpru2_1-fw"
-ALTERNATIVE:pru-icss-halt:append:j7 = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"
+ALTERNATIVE:pru-icss-halt:append:j721e  = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw"
 
  ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out"
  ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out"
Signature · 1 line
2.38.1
#8 lore raw

Re: [meta-ti][master/kirkstone][PATCH 5/7] conf: machine: Remove OPTEEOUTPUTMACHINE definition

In reply to Denys Dmytriyenko
Quoted 11 lines · Denys Dmytriyenko
Quoted 2 lines · Andrew Davis via lists.yoctoproject.org

This was used in the base Linaro optee-os_git.bb recipe, it is no longer used, remove it from our boards.

Well, it was still used in meta-arm up to and including Dunfell:
https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os_git.bb?h=dunfell#n57

Even though it got removed after Dunfell, there's one small reference remaining in meta-arago, which I assume you'd be taking care of next? :)
https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base-tisdk.bb#n30

Yup, this should be changed to using OPTEEMACHINE or similar.

Andrew

Quoted 124 lines
Quoted 124 lines
---
  meta-ti-bsp/conf/machine/am437x-hs-evm.conf | 1 -
  meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | 1 -
  meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | 1 -
  meta-ti-bsp/conf/machine/include/am62xx.inc | 1 -
  meta-ti-bsp/conf/machine/include/am64xx.inc | 1 -
  meta-ti-bsp/conf/machine/include/am65xx.inc | 1 -
  meta-ti-bsp/conf/machine/include/j7200.inc  | 1 -
  meta-ti-bsp/conf/machine/include/j721e.inc  | 1 -
  meta-ti-bsp/conf/machine/include/j721s2.inc | 1 -
  meta-ti-bsp/conf/machine/include/j784s4.inc | 1 -
  10 files changed, 10 deletions(-)
meta-ti-bsp/conf/machine/am437x-hs-evm.conf +0 -1
index 68b808d2..cdd664ac 100644
@@ -15,6 +15,5 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
 
  OPTEEMACHINE = "ti-am43xx"
  OPTEEFLAVOR = "am43xx"
-OPTEEOUTPUTMACHINE = "ti"
 
  EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +0 -1
index 5232cbd9..1e63f5d2 100644
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
 
  OPTEEMACHINE = "ti-am57xx"
  OPTEEFLAVOR = "am57xx"
-OPTEEOUTPUTMACHINE = "ti"
  OPTEEPAGER = "y"
 
  EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +0 -1
index 49630081..810d53ed 100644
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
 
  OPTEEMACHINE = "ti-dra7xx"
  OPTEEFLAVOR = "dra7xx"
-OPTEEOUTPUTMACHINE = "ti"
  OPTEEPAGER = "y"
 
  EXTRA_IMAGEDEPENDS += "optee-os"
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -1
index a5aad994..9d8bc87c 100644
@@ -19,4 +19,3 @@ TFA_BOARD = "lite"
  TFA_K3_SYSTEM_SUSPEND = "1"
 
  OPTEEMACHINE = "k3-am62x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/am64xx.inc +0 -1
index 055f6036..7c46b630 100644
@@ -33,4 +33,3 @@ do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
  TFA_BOARD = "lite"
  OPTEEMACHINE = "k3-am64x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/am65xx.inc +0 -1
index 80aa6d27..14e0d07f 100644
@@ -38,4 +38,3 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
  do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
  OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j7200.inc +0 -1
index 3aedb3f8..1eaf7806 100644
@@ -2,4 +2,3 @@ require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j7200"
 
  OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
meta-ti-bsp/conf/machine/include/j721e.inc +0 -1
index 8a6c2bec..34569a01 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j721e"
 
  OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
  MACHINE_FEATURES += "gpu"
 
meta-ti-bsp/conf/machine/include/j721s2.inc +0 -1
index 4959ad8f..2a60458e 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j721s2"
 
  OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
  MACHINE_FEATURES += "gpu"
 
meta-ti-bsp/conf/machine/include/j784s4.inc +0 -1
index 83d7c760..e2f053ac 100644
@@ -2,7 +2,6 @@ require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j784s4"
 
  OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
 
  MACHINE_FEATURES += "gpu"
 
Signature · 1 line
2.38.1
#11 lore raw

Re: [meta-ti][master/kirkstone][PATCH 6/7] conf: machine: Move TFA_BOARD and OPTEEMACHINE to the SoC level

In reply to Denys Dmytriyenko
Quoted 119 lines · Denys Dmytriyenko
Quoted 3 lines · Andrew Davis via lists.yoctoproject.org

These defines are specific to a SoC, not a SoC family (K3) nor any specific board. Move these to the SoC level for all boards to be consistent with boards already doing this correctly.

See the question below

Quoted 101 lines
---
  meta-ti-bsp/conf/machine/include/am64xx.inc | 1 +
  meta-ti-bsp/conf/machine/include/am65xx.inc | 2 ++
  meta-ti-bsp/conf/machine/include/j7200.inc  | 2 ++
  meta-ti-bsp/conf/machine/include/j721e.inc  | 6 ++++--
  meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++--
  meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ++++--
  meta-ti-bsp/conf/machine/include/k3.inc     | 1 -
  meta-ti-bsp/conf/machine/j721s2-evm.conf    | 1 -
  meta-ti-bsp/conf/machine/j784s4-evm.conf    | 4 ----
  9 files changed, 17 insertions(+), 12 deletions(-)
meta-ti-bsp/conf/machine/include/am64xx.inc +1 -0
index 7c46b630..f1a91991 100644
@@ -32,4 +32,5 @@ do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
  do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
 
  TFA_BOARD = "lite"
+
  OPTEEMACHINE = "k3-am64x"
meta-ti-bsp/conf/machine/include/am65xx.inc +2 -0
index 14e0d07f..88259717 100644
@@ -37,4 +37,6 @@ IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
  do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
  do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
+TFA_BOARD = "generic"
+
  OPTEEMACHINE = "k3-am65x"
meta-ti-bsp/conf/machine/include/j7200.inc +2 -0
index 1eaf7806..d21e26cc 100644
@@ -1,4 +1,6 @@
  require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j7200"
 
+TFA_BOARD = "generic"
+
  OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/j721e.inc +4 -2
index 34569a01..12ee0c90 100644
@@ -1,8 +1,6 @@
  require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j721e"
 
-OPTEEMACHINE = "k3-j721e"
-
  MACHINE_FEATURES += "gpu"
 
  PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "generic"
+
+OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/include/j721s2.inc +4 -2
index 2a60458e..fc6493b8 100644
@@ -1,8 +1,6 @@
  require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j721s2"
 
-OPTEEMACHINE = "k3-j721e"
-
  MACHINE_FEATURES += "gpu"
 
  PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "generic"
+
+OPTEEMACHINE = "k3-j784s4"
meta-ti-bsp/conf/machine/include/j784s4.inc +0 -2
index e2f053ac..d268b810 100644
@@ -1,8 +1,6 @@
  require conf/machine/include/k3.inc
  SOC_FAMILY:append = ":j784s4"
 
-OPTEEMACHINE = "k3-j721e"
-
  MACHINE_FEATURES += "gpu"
 
  PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs"

meta-ti-bsp/conf/machine/include/j784s4.inc PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" · line 12

Quoted 5 lines
meta-ti-bsp/conf/machine/include/j784s4.inc +2 -0
@@ -10,3 +8,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+TFA_BOARD = "j784s4"

Just wanted to check that it is the correct TFA_BOARD used here. I know that you are simply moving the existing value from EVM to SOC config, but I still wonder that we have these inconsistent values for all the K3 platforms:

Quoted 4 lines

1. generic
2. lite
3. j784s4

This is exactly why I'm moving them all to the SOC config level, makes it easier to check vs using EVM and K3 levels, here is the current mapping:

1. generic -> AM65x J721e J7200 J721s2
2. lite -> AM64x AM62x
3. j784s4 -> J784s4

Not super intuitive, but I haven't gotten around to cleaning up these names in TF-A yet.

Andrew

Quoted 49 lines
Quoted 49 lines
meta-ti-bsp/conf/machine/include/j784s4.inc +2 -0
+
+OPTEEMACHINE = "k3-j784s4"
meta-ti-bsp/conf/machine/include/k3.inc +0 -1
index 84afd2e2..bd71becf 100644
@@ -29,7 +29,6 @@ UBOOT_SUFFIX = "img"
  EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
  TFA_PLATFORM = "k3"
-TFA_BOARD = "generic"
 
  # Use the expected value of the ubifs filesystem's volume name in the kernel
  # and u-boot.
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -1
index 37353df4..46d5dbf6 100644
@@ -7,7 +7,6 @@ require conf/machine/include/j721s2.inc
  SERIAL_CONSOLES = "115200;ttyS2"
  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
  TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
  OPTEE_K3_USART = "0x8"
 
  KERNEL_DEVICETREE = " \
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -4
index 10d8aad0..f8be7d18 100644
@@ -7,7 +7,6 @@ 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 = " \
@@ -18,6 +17,3 @@ UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
  do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
  do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "j784s4"
-
Signature · 1 line
2.38.1
#23 lore raw
In reply to Andrew Davis

Ryan,

I believe we are fine merging this series as is and addressing the remaining cleanup items afterwards. Thanks.

Signature · 1 line
Denys
Quoted 19 lines · Andrew Davis via lists.yoctoproject.org

Multi-cert is already now the default, no need to add a comment on that.

---
 meta-ti-bsp/conf/machine/include/j7.inc | 2 --
 1 file changed, 2 deletions(-)
meta-ti-bsp/conf/machine/include/j7.inc +0 -2
index 4ea3a5d8..cf4cc440 100644
@@ -3,5 +3,3 @@ SOC_FAMILY:append = ":j7"
 
 OPTEEMACHINE = "k3-j721e"
 OPTEEOUTPUTMACHINE = "k3"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
Signature · 1 line
2.38.1
#25 lore raw
In reply to a message not in the archive

Ping.

Quoted 29 lines · Denys Dmytriyenko

Ryan,

I believe we are fine merging this series as is and addressing the remaining cleanup items afterwards. Thanks.

Signature · 1 line
Denys
Quoted 19 lines · Andrew Davis via lists.yoctoproject.org

Multi-cert is already now the default, no need to add a comment on that.

---
 meta-ti-bsp/conf/machine/include/j7.inc | 2 --
 1 file changed, 2 deletions(-)
meta-ti-bsp/conf/machine/include/j7.inc +0 -2
index 4ea3a5d8..cf4cc440 100644
@@ -3,5 +3,3 @@ SOC_FAMILY:append = ":j7"
 
 OPTEEMACHINE = "k3-j721e"
 OPTEEOUTPUTMACHINE = "k3"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
Signature · 1 line
2.38.1
#15 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

In reply to Andrew Davis
Quoted 18 lines · Andrew Davis via lists.yoctoproject.org

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

---

meta-ti-bsp/conf/machine/include/j721e.inc +0 -0
index 12ee0c90..6322fe46 100644

meta-ti-bsp/conf/machine/include/j721e.inc PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" · line 16

Quoted 8 lines
meta-ti-bsp/conf/machine/include/j721e.inc +5 -0
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"

There's a slight problem - k3r5-sr1-1 multiconfig previously only applied to the HS j721e-hs-evm device, but not the GP j721e-evm, see below.

Hence there's no corresponding k3r5 config j721e-evm-k3r5-sr1-1.conf exists, only the one for the HS - j721e-hs-evm-k3r5-sr1-1.conf

Since you moved the above BBMULTICONFIG line into the common j721e.inc, it now breaks with the error:

MACHINE=j721e-evm-k3r5-sr1-1 is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.

I can re-spin this series with a fix, so it's easier for Ryan to apply...

Quoted 9 lines
meta-ti-bsp/conf/machine/include/j721e.inc +6 -0
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"

<snip>

Quoted 29 lines
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
 KERNEL_DEVICETREE = " \
     ti/k3-j721e-common-proc-board.dtb \
     ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
 SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
#16 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

Quoted 34 lines · Denys Dmytriyenko
Quoted 18 lines · Andrew Davis via lists.yoctoproject.org

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

---

meta-ti-bsp/conf/machine/include/j721e.inc +0 -0
index 12ee0c90..6322fe46 100644

meta-ti-bsp/conf/machine/include/j721e.inc PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" · line 16

Quoted 8 lines
meta-ti-bsp/conf/machine/include/j721e.inc +5 -0
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"

There's a slight problem - k3r5-sr1-1 multiconfig previously only applied to the HS j721e-hs-evm device, but not the GP j721e-evm, see below.

Hence there's no corresponding k3r5 config j721e-evm-k3r5-sr1-1.conf exists, only the one for the HS - j721e-hs-evm-k3r5-sr1-1.conf

Quoted 6 lines

Since you moved the above BBMULTICONFIG line into the common j721e.inc, it now breaks with the error:

MACHINE=j721e-evm-k3r5-sr1-1 is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.

I can re-spin this series with a fix, so it's easier for Ryan to apply...

I literally just ran into this while doing the test builds and added the missing file. Please feel free to redo the patch series and I'll reapply everything.

Quoted 42 lines
Quoted 10 lines
meta-ti-bsp/conf/machine/include/j721e.inc +6 -0
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
  TFA_BOARD = "generic"
 
  OPTEEMACHINE = "k3-j721e"

<snip>

Quoted 29 lines
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
  SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
  KERNEL_DEVICETREE = " \
      ti/k3-j721e-common-proc-board.dtb \
      ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
  UBOOT_BINARY = "u-boot.img_HS"
  UBOOT_SYMLINK = "u-boot.img"
  SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#17 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

Quoted 39 lines · Ryan Eatmon
Quoted 36 lines · Denys Dmytriyenko
Quoted 18 lines · Andrew Davis via lists.yoctoproject.org

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

---

meta-ti-bsp/conf/machine/include/j721e.inc +0 -0
index 12ee0c90..6322fe46 100644

meta-ti-bsp/conf/machine/include/j721e.inc PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" · line 15

Quoted 7 lines
meta-ti-bsp/conf/machine/include/j721e.inc +5 -0
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"

There's a slight problem - k3r5-sr1-1 multiconfig previously only applied to the HS j721e-hs-evm device, but not the GP j721e-evm, see below.

Hence there's no corresponding k3r5 config j721e-evm-k3r5-sr1-1.conf exists, only the one for the HS - j721e-hs-evm-k3r5-sr1-1.conf

Since you moved the above BBMULTICONFIG line into the common j721e.inc, it now breaks with the error:

Quoted 7 lines
Quoted 3 lines

MACHINE=j721e-evm-k3r5-sr1-1 is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.

I can re-spin this series with a fix, so it's easier for Ryan to apply...

I literally just ran into this while doing the test builds and added the missing file. Please feel free to redo the patch series and I'll reapply everything.

Well, it wasn't as simple as just adding the conf file...

Anyway, I'm beginning to suspect that J721e SR1.1 is identical to SR1 for GP devices and only differs for HS devices. See this code in the imggen Makefile:

https://git.ti.com/cgit/k3-image-gen/k3-image-gen/tree/Makefile#n50

ifeq ($(SOC_TYPE),gp)
ifeq ($(SOC), j721e_sr1_1)
override SOC = j721e
endif
endif

So, basically it falls back to the same code path, meaning building both of them is just a waste of time, moreover the filenames will need to be accounted for, as it does not generate the required sysfw-j721e_sr1_1-evm.itb and obviously fails to deploy...

Quoted 39 lines
Quoted 39 lines
Quoted 8 lines
meta-ti-bsp/conf/machine/include/j721e.inc +6 -0
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
 TFA_BOARD = "generic"
 OPTEEMACHINE = "k3-j721e"

<snip>

Quoted 28 lines
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
 KERNEL_DEVICETREE = " \
     ti/k3-j721e-common-proc-board.dtb \
     ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
 SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
#19 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

In reply to a message not in the archive
Quoted 61 lines · Denys Dmytriyenko
Quoted 39 lines · Ryan Eatmon
Quoted 36 lines · Denys Dmytriyenko
Quoted 18 lines · Andrew Davis via lists.yoctoproject.org

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

---

meta-ti-bsp/conf/machine/include/j721e.inc +0 -0
index 12ee0c90..6322fe46 100644

meta-ti-bsp/conf/machine/include/j721e.inc PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" · line 15

Quoted 7 lines
meta-ti-bsp/conf/machine/include/j721e.inc +5 -0
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"

There's a slight problem - k3r5-sr1-1 multiconfig previously only applied to the HS j721e-hs-evm device, but not the GP j721e-evm, see below.

Hence there's no corresponding k3r5 config j721e-evm-k3r5-sr1-1.conf exists, only the one for the HS - j721e-hs-evm-k3r5-sr1-1.conf

Since you moved the above BBMULTICONFIG line into the common j721e.inc, it now breaks with the error:

Quoted 7 lines
Quoted 3 lines

MACHINE=j721e-evm-k3r5-sr1-1 is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.

I can re-spin this series with a fix, so it's easier for Ryan to apply...

I literally just ran into this while doing the test builds and added the missing file. Please feel free to redo the patch series and I'll reapply everything.

Well, it wasn't as simple as just adding the conf file...

Anyway, I'm beginning to suspect that J721e SR1.1 is identical to SR1 for GP devices and only differs for HS devices. See this code in the imggen Makefile:

https://git.ti.com/cgit/k3-image-gen/k3-image-gen/tree/Makefile#n50

ifeq ($(SOC_TYPE),gp)
ifeq ($(SOC), j721e_sr1_1)
override SOC = j721e
endif
endif

Quoted 4 lines

So, basically it falls back to the same code path, meaning building both of them is just a waste of time, moreover the filenames will need to be accounted for, as it does not generate the required sysfw-j721e_sr1_1-evm.itb and obviously fails to deploy...

Andrew, Ryan,

First of all, this patch set was not locally tested - shame on you, Andrew! :)

Second, do we want to go back to SR1.1 only for HS, or jump through the hoops to make it work for GP as well?

Quoted 39 lines
Quoted 39 lines
Quoted 39 lines
Quoted 8 lines
meta-ti-bsp/conf/machine/include/j721e.inc +6 -0
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
 TFA_BOARD = "generic"
 OPTEEMACHINE = "k3-j721e"

<snip>

Quoted 28 lines
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
 KERNEL_DEVICETREE = " \
     ti/k3-j721e-common-proc-board.dtb \
     ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
 SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
#20 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

Quoted 49 lines · Denys Dmytriyenko
Quoted 48 lines · Denys Dmytriyenko
Quoted 46 lines · Ryan Eatmon
Quoted 33 lines · Denys Dmytriyenko
Quoted 18 lines · Andrew Davis via lists.yoctoproject.org

The WIC image for K3 depends on the TI-SCI firmware, on AM65x and J721e also the bootloader. Make this clear by only depending on firmware in the base k3.inc file, then adding the bootloader dependency in AM65x and J721e specific includes.

Remove unneeded overrides from the evm level files.

Remove do_image_tar dependencies as the tar files do not include the bootloader nor TI-SCI firmware, only the boot partition of the WIC file needs these.

---

meta-ti-bsp/conf/machine/include/j721e.inc +0 -0
index 12ee0c90..6322fe46 100644

meta-ti-bsp/conf/machine/include/j721e.inc PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" · line 15

Quoted 7 lines
meta-ti-bsp/conf/machine/include/j721e.inc +5 -0
@@ -9,6 +9,17 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
  PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
+do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+
+# Default sysfw.itb on J721e is for SR1.1
+BBMULTICONFIG += "k3r5-sr1-1"

There's a slight problem - k3r5-sr1-1 multiconfig previously only applied to the HS j721e-hs-evm device, but not the GP j721e-evm, see below.

Hence there's no corresponding k3r5 config j721e-evm-k3r5-sr1-1.conf exists, only the one for the HS - j721e-hs-evm-k3r5-sr1-1.conf

Quoted 6 lines

Since you moved the above BBMULTICONFIG line into the common j721e.inc, it now breaks with the error:

MACHINE=j721e-evm-k3r5-sr1-1 is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.

I can re-spin this series with a fix, so it's easier for Ryan to apply...

I literally just ran into this while doing the test builds and added the missing file. Please feel free to redo the patch series and I'll reapply everything.

Quoted 5 lines
Quoted 5 lines

Well, it wasn't as simple as just adding the conf file...

Anyway, I'm beginning to suspect that J721e SR1.1 is identical to SR1 for GP devices and only differs for HS devices. See this code in the imggen Makefile:

Your suspicion is correct, SR1.1 is a re-spin made to fix a ROM bug relating to HS, and so SR1.1 GP chips are effectively the same as SR1.0 GP.

Quoted 8 lines
Quoted 8 lines

https://git.ti.com/cgit/k3-image-gen/k3-image-gen/tree/Makefile#n50

ifeq ($(SOC_TYPE),gp)
ifeq ($(SOC), j721e_sr1_1)
override SOC = j721e
endif
endif

Quoted 9 lines
Quoted 4 lines

So, basically it falls back to the same code path, meaning building both of them is just a waste of time, moreover the filenames will need to be accounted for, as it does not generate the required sysfw-j721e_sr1_1-evm.itb and obviously fails to deploy...

Andrew, Ryan,

First of all, this patch set was not locally tested - shame on you, Andrew! :)

Testing, what's that? Sounds like a maintainers' problem :D

Quoted 3 lines

Second, do we want to go back to SR1.1 only for HS, or jump through the hoops to make it work for GP as well?

I'd imagine there are very few SR1.0 HS chips left out there, and none went to production, might be time we drop that support instead. Then just go back to one type for J721e HS and call it the same for both GP and HS, drop all the _sr1_1 postfixes or add them to GP (since it doesn't matter for GP).

Andrew

Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 9 lines
meta-ti-bsp/conf/machine/include/j721e.inc +6 -0
+do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
+IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
+
  TFA_BOARD = "generic"
  OPTEEMACHINE = "k3-j721e"

<snip>

Quoted 28 lines
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
index d28d16d1..fe28e6f5 100644
@@ -7,9 +7,6 @@ require conf/machine/include/j721e.inc
  SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
  KERNEL_DEVICETREE = " \
      ti/k3-j721e-common-proc-board.dtb \
      ti/k3-j721e-common-proc-board-infotainment.dtbo \
meta-ti-bsp/conf/machine/j721e-hs-evm.conf +0 -7
index 9ef7b86a..acd5ca18 100644
@@ -18,10 +18,3 @@ SPL_BINARY = "tispl.bin_HS"
  UBOOT_BINARY = "u-boot.img_HS"
  UBOOT_SYMLINK = "u-boot.img"
  SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
#21 lore raw

Re: [meta-ti][master/kirkstone][PATCH 7/7] conf: machine: Rework do_image_wic dependencies

Quoted 10 lines · Andrew Davis via lists.yoctoproject.org
Quoted 5 lines · Denys Dmytriyenko
Quoted 4 lines · Denys Dmytriyenko

Well, it wasn't as simple as just adding the conf file...

Anyway, I'm beginning to suspect that J721e SR1.1 is identical to SR1 for GP devices and only differs for HS devices. See this code in the imggen Makefile:

Your suspicion is correct, SR1.1 is a re-spin made to fix a ROM bug relating to HS, and so SR1.1 GP chips are effectively the same as SR1.0 GP.

Quoted 7 lines
Quoted 2 lines

Second, do we want to go back to SR1.1 only for HS, or jump through the hoops to make it work for GP as well?

I'd imagine there are very few SR1.0 HS chips left out there, and none went to production, might be time we drop that support instead. Then just go back to one type for J721e HS and call it the same for both GP and HS, drop all the _sr1_1 postfixes or add them to GP (since it doesn't matter for GP).

I've posted a re-spin of this series last night with this change:
https://patchwork.yoctoproject.org/project/ti/list/?series=9825

Only #7 is different:
https://patchwork.yoctoproject.org/project/ti/patch/[email protected]/

Here's the exact change between v1 and v2, dropping sr1-1 multiconfig:

From e06c62f5ba6e37c6a8ee513010bff794f7e1b1cf Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <[email protected]>
Date: Fri, 20 Jan 2023 01:08:28 +0000
Subject: [PATCH] fixup! conf: machine: Rework do_image_wic dependencies

---
 meta-ti-bsp/conf/machine/include/j721e.inc            |  6 ------
 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf | 11 -----------
 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf       |  3 +--
 meta-ti-bsp/conf/multiconfig/k3r5-sr1-1.conf          |  3 ---
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf
 delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1-1.conf
meta-ti-bsp/conf/machine/include/j721e.inc +0 -6
index 6322fe46..eba10d8d 100644
@@ -12,14 +12,8 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
 do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 
-# Default sysfw.itb on J721e is for SR1.1
-BBMULTICONFIG += "k3r5-sr1-1"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
 IMAGE_BOOT_FILES += "sysfw.itb"
 
-# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf deleted +0 -11
deleted file mode 100644
index 6e809f46..00000000
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721e SR1.1 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721e SR1.1 HS EVM (R5F core)
-
-# Booting SR1.1 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/j721e-hs-evm-k3r5.conf
-SOC_FAMILY:append = ":k3r5-sr1-1"
-
-SYSFW_SOC = "j721e_sr1_1"
-SYSFW_SYMLINK = "sysfw.itb"
meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +1 -2
index a0d000b2..56312c0c 100644
@@ -4,10 +4,9 @@
 
 require conf/machine/include/k3r5.inc
 
-SYSFW_SOC = "j721e"
+SYSFW_SOC = "j721e_sr1_1"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
-SYSFW_SYMLINK = ""
 
 SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
 SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
meta-ti-bsp/conf/multiconfig/k3r5-sr1-1.conf deleted +0 -3
deleted file mode 100644
index 428f2212..00000000
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE:append = "-sr1-1"
Signature · 1 line
2.25.1