[meta-ti][dunfell][PATCH 0/3] J7 name backports from master/kirkstone

[meta-ti][dunfell][PATCH 0/3] J7 name backports from master/kirkstone

[Andrew Davis]

Hello all,

Some backports from master/kirkstone that help with the naming of J7
family SoCs. This is needed to prevent some breaks on HS J7 as it
is often forgotten when we add features to the non-HS EVM by name.

Thanks,
Andrew

Andrew Davis (3):
  meta-ti: Rename j7-evm to j721e-evm
  meta-ti: Add SoC families for the J7 SoCs
  meta-ti: Use new J7 SoC names over specific board names

 conf/machine/include/j7200.inc                 |  2 ++
 conf/machine/include/j721e.inc                 |  4 ++++
 conf/machine/include/j721s2.inc                |  2 ++
 conf/machine/j7200-evm.conf                    |  2 +-
 .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
 conf/machine/{j7-evm.conf => j721e-evm.conf}   |  8 +++-----
 ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
 ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
 .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
 conf/machine/j721s2-evm.conf                   |  2 +-
 .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
 .../ti-img-rogue-driver_1.15.6133109.bb        | 14 +++++---------
 recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
 .../viddec-test-app_1.0.0.bb                   |  2 +-
 .../videnc-test-app_1.0.0.bb                   |  2 +-
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 +++++++++---------
 .../trusted-firmware-a_%.bbappend              |  2 +-
 .../ti-img-rogue-umlibs_1.15.6133109.bb        |  8 +++-----
 recipes-kernel/linux/kernel-rdepends.inc       |  6 ++----
 recipes-security/optee/optee-os_%.bbappend     |  2 +-
 recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
 21 files changed, 51 insertions(+), 53 deletions(-)
 create mode 100644 conf/machine/include/j7200.inc
 create mode 100644 conf/machine/include/j721e.inc
 create mode 100644 conf/machine/include/j721s2.inc
 rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
 rename conf/machine/{j7-evm.conf => j721e-evm.conf} (77%)
 rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%)
 rename conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (81%)
 rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)

-- 
2.36.1

[meta-ti][dunfell][PATCH 1/3] meta-ti: Rename j7-evm to j721e-evm

[Andrew Davis]

In many places we use "j7" (the family name) when we should be using a
specific SoC or EVM and vice-versa. For instance when including graphics
drivers we add for all the "j7" family, but what we really want is only
for some specific j7 SoCs.

First step in untangling this is to make it clear that there is no SoC
called "j7". There is a SoC called j721e with a j721e-evm.

Fix up this naming here.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
 conf/machine/{j7-evm.conf => j721e-evm.conf}   |  4 ++--
 ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
 ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
 .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
 .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
 .../ti-img-rogue-driver_1.15.6133109.bb        | 10 +++++-----
 recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
 .../viddec-test-app_1.0.0.bb                   |  2 +-
 .../videnc-test-app_1.0.0.bb                   |  2 +-
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 +++++++++---------
 .../trusted-firmware-a_%.bbappend              |  2 +-
 .../ti-img-rogue-umlibs_1.15.6133109.bb        |  6 +++---
 recipes-kernel/linux/kernel-rdepends.inc       |  4 ++--
 recipes-security/optee/optee-os_%.bbappend     |  2 +-
 recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
 16 files changed, 40 insertions(+), 40 deletions(-)
 rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
 rename conf/machine/{j7-evm.conf => j721e-evm.conf} (87%)
 rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%)
 rename conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (81%)
 rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)

diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j721e-evm-k3r5.conf
similarity index 81%
rename from conf/machine/j7-evm-k3r5.conf
rename to conf/machine/j721e-evm-k3r5.conf
index 862b017c..9544cdb6 100644
--- a/conf/machine/j7-evm-k3r5.conf
+++ b/conf/machine/j721e-evm-k3r5.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: J7 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7 EVM (R5F core)
+#@NAME: J721e EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721e EVM (R5F core)
 
 require conf/machine/include/k3r5.inc
 
diff --git a/conf/machine/j7-evm.conf b/conf/machine/j721e-evm.conf
similarity index 87%
rename from conf/machine/j7-evm.conf
rename to conf/machine/j721e-evm.conf
index 514695d6..8598c672 100644
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j721e-evm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: J7 EVM
-#@DESCRIPTION: Machine configuration for the TI J7 EVM
+#@NAME: J721e EVM
+#@DESCRIPTION: Machine configuration for the TI J721e EVM
 
 require conf/machine/include/j7.inc
 
diff --git a/conf/machine/j7-hs-evm-k3r5-sr1-1.conf b/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf
similarity index 53%
rename from conf/machine/j7-hs-evm-k3r5-sr1-1.conf
rename to conf/machine/j721e-hs-evm-k3r5-sr1-1.conf
index 7d1f4afc..f8004413 100644
--- a/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
+++ b/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf
@@ -1,10 +1,10 @@
 #@TYPE: Machine
-#@NAME: J7 SR1.1 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7 SR1.1 HS EVM (R5F core)
+#@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/j7-hs-evm-k3r5.conf
+require conf/machine/j721e-hs-evm-k3r5.conf
 SOC_FAMILY_append = ":k3r5-sr1-1"
 
 SYSFW_SOC = "j721e_sr1_1"
diff --git a/conf/machine/j7-hs-evm-k3r5.conf b/conf/machine/j721e-hs-evm-k3r5.conf
similarity index 81%
rename from conf/machine/j7-hs-evm-k3r5.conf
rename to conf/machine/j721e-hs-evm-k3r5.conf
index e4b233db..a0d000b2 100644
--- a/conf/machine/j7-hs-evm-k3r5.conf
+++ b/conf/machine/j721e-hs-evm-k3r5.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: J7 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7 HS EVM (R5F core)
+#@NAME: J721e HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721e HS EVM (R5F core)
 
 require conf/machine/include/k3r5.inc
 
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j721e-hs-evm.conf
similarity index 85%
rename from conf/machine/j7-hs-evm.conf
rename to conf/machine/j721e-hs-evm.conf
index bbfe6fcb..26db61c7 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j721e-hs-evm.conf
@@ -1,8 +1,8 @@
 #@TYPE: Machine
-#@NAME: J7 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J7 HS EVM
+#@NAME: J721e HS EVM
+#@DESCRIPTION: Machine configuration for the TI J721e HS EVM
 
-require conf/machine/j7-evm.conf
+require conf/machine/j721e-evm.conf
 
 UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig"
 
diff --git a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
index ec102761..0967e674 100644
--- a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -10,7 +10,7 @@ PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm"
+COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
index 7fcbd96a..bdb48b85 100644
--- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
+++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"
+COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"
 
 DEPENDS = "virtual/kernel"
 
@@ -28,13 +28,13 @@ S = "${WORKDIR}/git"
 
 SRCREV = "6d3d62a15ceb85b719c35f34c6c9e35f556b406b"
 
-TARGET_PRODUCT_j7-evm = "j721e_linux"
-TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
+TARGET_PRODUCT_j721e-evm = "j721e_linux"
+TARGET_PRODUCT_j721e-hs-evm = "j721e_linux"
 TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
 TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux"
 TARGET_PRODUCT_am62xx = "am62_linux"
-TARGET_BVNC_j7-evm = "22.104.208.318"
-TARGET_BVNC_j7-hs-evm = "22.104.208.318"
+TARGET_BVNC_j721e-evm = "22.104.208.318"
+TARGET_BVNC_j721e-hs-evm = "22.104.208.318"
 TARGET_BVNC_j721s2-evm = "36.53.104.796"
 TARGET_BVNC_j721s2-hs-evm = "36.53.104.796"
 TARGET_BVNC_am62xx = "33.15.11.3"
diff --git a/recipes-bsp/sciclient/sciclient-rtos_git.bb b/recipes-bsp/sciclient/sciclient-rtos_git.bb
index deaf0b12..77de0aab 100644
--- a/recipes-bsp/sciclient/sciclient-rtos_git.bb
+++ b/recipes-bsp/sciclient/sciclient-rtos_git.bb
@@ -27,7 +27,7 @@ export PDK_SCICLIENT_ROOT_PATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/pac
 
 BUILD_HS = ""
 BUILD_HS_am65xx-hs-evm = "yes"
-BUILD_HS_j7-hs-evm = "yes"
+BUILD_HS_j721e-hs-evm = "yes"
 export BUILD_HS
 
 # Sciclient for am65x supports mcu1_1 in addition to the default cores in TI_PDK_LIMIT_CORES
@@ -92,7 +92,7 @@ do_compile_prepend_am65xx-evm() {
 }
 
 
-do_compile_prepend_j7-evm() {
+do_compile_prepend_j721e-evm() {
 
     cd ${SCICLIENT_ROOTPATH}/tools
     # Create the .bin file for GP
@@ -100,7 +100,7 @@ do_compile_prepend_j7-evm() {
     cd -
 }
 
-do_compile_prepend_j7-hs-evm() {
+do_compile_prepend_j721e-hs-evm() {
 
     cd ${SCICLIENT_ROOTPATH}/tools
     # Create the .bin file for HS
diff --git a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
index bd863c0a..4add7e33 100644
--- a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "libdrm ffmpeg"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm"
+COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm"
 
 PR = "r1"
 SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2"
diff --git a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
index 71f5cfbf..a57acf64 100644
--- a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "libdrm"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm"
+COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm"
 
 PR = "r0"
 SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a"
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 3986af47..59193dfe 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -6,9 +6,9 @@ DEPENDS_remove_am65xx-evm-k3r5 = " virtual/bootloader"
 DEPENDS_remove_am65xx-evm-k3r5-sr2 = " virtual/bootloader"
 DEPENDS_remove_am65xx-hs-evm-k3r5 = " virtual/bootloader"
 DEPENDS_remove_am65xx-hs-evm-k3r5-sr2 = " virtual/bootloader"
-DEPENDS_remove_j7-evm-k3r5 = " virtual/bootloader"
-DEPENDS_remove_j7-hs-evm-k3r5 = " virtual/bootloader"
-DEPENDS_remove_j7-hs-evm-k3r5-sr1-1 = " virtual/bootloader"
+DEPENDS_remove_j721e-evm-k3r5 = " virtual/bootloader"
+DEPENDS_remove_j721e-hs-evm-k3r5 = " virtual/bootloader"
+DEPENDS_remove_j721e-hs-evm-k3r5-sr1-1 = " virtual/bootloader"
 DEPENDS_append = " ${@ '' if '${TI_SECURE_DEV_PKG_K3}' else 'ti-k3-secdev-native' }"
 
 CLEANBROKEN = "1"
@@ -28,9 +28,9 @@ SYSFW_SUFFIX ?= "unknown"
 SYSFW_CONFIG ?= "unknown"
 
 SYSFW_PREFIX = "sci"
-SYSFW_PREFIX_j7-evm-k3r5 = "fs"
-SYSFW_PREFIX_j7-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs"
+SYSFW_PREFIX_j721e-evm-k3r5 = "fs"
+SYSFW_PREFIX_j721e-hs-evm-k3r5 = "fs"
+SYSFW_PREFIX_j721e-hs-evm-k3r5-sr1-1 = "fs"
 SYSFW_PREFIX_j7200-evm-k3r5 = "fs"
 SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs"
 SYSFW_PREFIX_j721s2-evm-k3r5 = "fs"
@@ -64,9 +64,9 @@ EXTRA_OEMAKE_remove_am65xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl
 EXTRA_OEMAKE_remove_am65xx-evm-k3r5-sr2 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5-sr2 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
-EXTRA_OEMAKE_remove_j7-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
-EXTRA_OEMAKE_remove_j7-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
-EXTRA_OEMAKE_remove_j7-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE_remove_j721e-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE_remove_j721e-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE_remove_j721e-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 
 do_compile() {
 	cd ${WORKDIR}/imggen/
diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index a1df380f..4b0414bc 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -31,7 +31,7 @@ do_compile_append_am64xx-evm() {
 	tfa_sign_k3hs
 }
 
-do_compile_append_j7-hs-evm() {
+do_compile_append_j721e-hs-evm() {
 	tfa_sign_k3hs
 }
 
diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
index 323978bf..5c6484a5 100644
--- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
+++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
@@ -8,7 +8,7 @@ inherit features_check
 REQUIRED_MACHINE_FEATURES = "gpu"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"
+COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"
 
 PR = "r2"
 
@@ -17,8 +17,8 @@ BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize"
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
 SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed"
 
-TARGET_PRODUCT_j7-evm = "j721e_linux"
-TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
+TARGET_PRODUCT_j721e-evm = "j721e_linux"
+TARGET_PRODUCT_j721e-hs-evm = "j721e_linux"
 TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
 TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux"
 TARGET_PRODUCT_am62xx = "am62_linux"
diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc
index c181c893..c6bae54b 100644
--- a/recipes-kernel/linux/kernel-rdepends.inc
+++ b/recipes-kernel/linux/kernel-rdepends.inc
@@ -38,8 +38,8 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2 p
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx = " prueth-fw-am65x-sr2"
 
 # Add run-time dependency for Cadence MHDP firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-hs-evm = " cadence-mhdp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721e-evm = " cadence-mhdp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721e-hs-evm = " cadence-mhdp-fw"
 
 # Add run-time dependency for Video Decoding firmware to the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " vxd-dec-fw"
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index cc9857e0..02ed576f 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -71,7 +71,7 @@ do_compile_append_am64xx-evm() {
     optee_sign_k3hs
 }
 
-do_compile_append_j7-hs-evm() {
+do_compile_append_j721e-hs-evm() {
     optee_sign_k3hs
 }
 
diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 19ea93f1..adfd3f57 100644
--- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -51,7 +51,7 @@ LEGACY_DM_FW_DIR  = "${D}${base_libdir}/firmware/pdk-ipc/"
 DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
 
 # J7 HS support
-do_install_prepend_j7-hs-evm() {
+do_install_prepend_j721e-hs-evm() {
         export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
         ( cd ${RTOS_DM_FW_DIR}; \
                 mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
-- 
2.36.1

[meta-ti][dunfell][PATCH 2/3] meta-ti: Add SoC families for the J7 SoCs

[Andrew Davis]

This allows us to be more specific around what SoCs we support and
lets us add features based on the SoC family not just at the EVM or
whole J7 family level.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 conf/machine/include/j7200.inc  | 2 ++
 conf/machine/include/j721e.inc  | 4 ++++
 conf/machine/include/j721s2.inc | 2 ++
 conf/machine/j7200-evm.conf     | 2 +-
 conf/machine/j721e-evm.conf     | 4 +---
 conf/machine/j721s2-evm.conf    | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 conf/machine/include/j7200.inc
 create mode 100644 conf/machine/include/j721e.inc
 create mode 100644 conf/machine/include/j721s2.inc

diff --git a/conf/machine/include/j7200.inc b/conf/machine/include/j7200.inc
new file mode 100644
index 00000000..ce88567c
--- /dev/null
+++ b/conf/machine/include/j7200.inc
@@ -0,0 +1,2 @@
+require conf/machine/include/j7.inc
+SOC_FAMILY:append = ":j7200"
diff --git a/conf/machine/include/j721e.inc b/conf/machine/include/j721e.inc
new file mode 100644
index 00000000..d965327c
--- /dev/null
+++ b/conf/machine/include/j721e.inc
@@ -0,0 +1,4 @@
+require conf/machine/include/j7.inc
+SOC_FAMILY:append = ":j721e"
+
+MACHINE_FEATURES += "gpu"
diff --git a/conf/machine/include/j721s2.inc b/conf/machine/include/j721s2.inc
new file mode 100644
index 00000000..113f86c4
--- /dev/null
+++ b/conf/machine/include/j721s2.inc
@@ -0,0 +1,2 @@
+require conf/machine/include/j7.inc
+SOC_FAMILY:append = ":j721s2"
diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
index c8a03a7b..303ec182 100644
--- a/conf/machine/j7200-evm.conf
+++ b/conf/machine/j7200-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: J7200 EVM
 #@DESCRIPTION: Machine configuration for the TI J7200 EVM
 
-require conf/machine/include/j7.inc
+require conf/machine/include/j7200.inc
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/conf/machine/j721e-evm.conf b/conf/machine/j721e-evm.conf
index 8598c672..030edc73 100644
--- a/conf/machine/j721e-evm.conf
+++ b/conf/machine/j721e-evm.conf
@@ -2,9 +2,7 @@
 #@NAME: J721e EVM
 #@DESCRIPTION: Machine configuration for the TI J721e EVM
 
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
+require conf/machine/include/j721e.inc
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
index ba5e8def..3a28dc61 100644
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: J721S2 EVM
 #@DESCRIPTION: Machine configuration for the TI J721S2 EVM
 
-require conf/machine/include/j7.inc
+require conf/machine/include/j721s2.inc
 
 MACHINE_FEATURES += "gpu"
 
-- 
2.36.1

[meta-ti][dunfell][PATCH 3/3] meta-ti: Use new J7 SoC names over specific board names

[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.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb |  2 +-
 .../ti-img-rogue-driver_1.15.6133109.bb            | 14 +++++---------
 .../ti-img-encode-decode/viddec-test-app_1.0.0.bb  |  2 +-
 .../ti-img-encode-decode/videnc-test-app_1.0.0.bb  |  2 +-
 .../libgles/ti-img-rogue-umlibs_1.15.6133109.bb    |  8 +++-----
 recipes-kernel/linux/kernel-rdepends.inc           |  6 ++----
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
index 0967e674..5528bfbc 100644
--- a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -10,7 +10,7 @@ PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm"
+COMPATIBLE_MACHINE = "j721e"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
index bdb48b85..2b6916fb 100644
--- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
+++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"
+COMPATIBLE_MACHINE = "j721e|j721s2|am62xx"
 
 DEPENDS = "virtual/kernel"
 
@@ -28,15 +28,11 @@ S = "${WORKDIR}/git"
 
 SRCREV = "6d3d62a15ceb85b719c35f34c6c9e35f556b406b"
 
-TARGET_PRODUCT_j721e-evm = "j721e_linux"
-TARGET_PRODUCT_j721e-hs-evm = "j721e_linux"
-TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
-TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux"
+TARGET_PRODUCT_j721e = "j721e_linux"
+TARGET_PRODUCT_j721s2 = "j721s2_linux"
 TARGET_PRODUCT_am62xx = "am62_linux"
-TARGET_BVNC_j721e-evm = "22.104.208.318"
-TARGET_BVNC_j721e-hs-evm = "22.104.208.318"
-TARGET_BVNC_j721s2-evm = "36.53.104.796"
-TARGET_BVNC_j721s2-hs-evm = "36.53.104.796"
+TARGET_BVNC_j721e = "22.104.208.318"
+TARGET_BVNC_j721s2 = "36.53.104.796"
 TARGET_BVNC_am62xx = "33.15.11.3"
 PVR_BUILD = "release"
 PVR_WS = "wayland"
diff --git a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
index 4add7e33..599bd44b 100644
--- a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "libdrm ffmpeg"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm"
+COMPATIBLE_MACHINE = "j721e"
 
 PR = "r1"
 SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2"
diff --git a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
index a57acf64..54bf594d 100644
--- a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "libdrm"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm"
+COMPATIBLE_MACHINE = "j721e"
 
 PR = "r0"
 SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a"
diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
index 5c6484a5..a5609ac5 100644
--- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
+++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
@@ -8,7 +8,7 @@ inherit features_check
 REQUIRED_MACHINE_FEATURES = "gpu"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j721e-evm|j721e-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"
+COMPATIBLE_MACHINE = "j721e|j721s2|am62xx"
 
 PR = "r2"
 
@@ -17,10 +17,8 @@ BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize"
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
 SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed"
 
-TARGET_PRODUCT_j721e-evm = "j721e_linux"
-TARGET_PRODUCT_j721e-hs-evm = "j721e_linux"
-TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
-TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux"
+TARGET_PRODUCT_j721e = "j721e_linux"
+TARGET_PRODUCT_j721s2 = "j721s2_linux"
 TARGET_PRODUCT_am62xx = "am62_linux"
 PVR_BUILD ?= "release"
 PVR_WS = "wayland"
diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc
index c6bae54b..047c4ec7 100644
--- a/recipes-kernel/linux/kernel-rdepends.inc
+++ b/recipes-kernel/linux/kernel-rdepends.inc
@@ -38,15 +38,13 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2 p
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx = " prueth-fw-am65x-sr2"
 
 # Add run-time dependency for Cadence MHDP firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721e-evm = " cadence-mhdp-fw"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721e-hs-evm = " cadence-mhdp-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721e = " cadence-mhdp-fw"
 
 # Add run-time dependency for Video Decoding firmware to the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " vxd-dec-fw"
 
 # Add run-time dependency for Chips&Media Wave521 firmware to the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-evm = " cnm-wave-fw"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cnm-wave-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2 = " cnm-wave-fw"
 
 # Add run-time dependency for TIFS Low Power Module stub
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub"
-- 
2.36.1

Re: [meta-ti][dunfell][PATCH 1/3] meta-ti: Rename j7-evm to j721e-evm

[Ryan Eatmon]

On 8/31/2022 12:53, Andrew Davis wrote:
> In many places we use "j7" (the family name) when we should be using a
> specific SoC or EVM and vice-versa. For instance when including graphics
> drivers we add for all the "j7" family, but what we really want is only
> for some specific j7 SoCs.
> 
> First step in untangling this is to make it clear that there is no SoC
> called "j7". There is a SoC called j721e with a j721e-evm.
> 
> Fix up this naming here.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>   .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
>   conf/machine/{j7-evm.conf => j721e-evm.conf}   |  4 ++--
>   ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
>   ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
>   .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
>   .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
>   .../ti-img-rogue-driver_1.15.6133109.bb        | 10 +++++-----
>   recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
>   .../viddec-test-app_1.0.0.bb                   |  2 +-
>   .../videnc-test-app_1.0.0.bb                   |  2 +-
>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 +++++++++---------
>   .../trusted-firmware-a_%.bbappend              |  2 +-
>   .../ti-img-rogue-umlibs_1.15.6133109.bb        |  6 +++---
>   recipes-kernel/linux/kernel-rdepends.inc       |  4 ++--
>   recipes-security/optee/optee-os_%.bbappend     |  2 +-
>   recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
>   16 files changed, 40 insertions(+), 40 deletions(-)
>   rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
>   rename conf/machine/{j7-evm.conf => j721e-evm.conf} (87%)
>   rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%)
>   rename conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (81%)
>   rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)
> 
> diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j721e-evm-k3r5.conf
> similarity index 81%
> rename from conf/machine/j7-evm-k3r5.conf
> rename to conf/machine/j721e-evm-k3r5.conf


So this changes the name of the yocto build machine label...  This will 
be impactful to users used to building j7-evm and for our build and 
testing scripts.  I will need to test this and work with Minas to make 
changes on the testing side before I can merge it in.



-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

Re: [meta-ti][dunfell][PATCH 1/3] meta-ti: Rename j7-evm to j721e-evm

[Denys Dmytriyenko]

On Thu, Sep 01, 2022 at 10:31:42AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> 
> 
> On 8/31/2022 12:53, Andrew Davis wrote:
> >In many places we use "j7" (the family name) when we should be using a
> >specific SoC or EVM and vice-versa. For instance when including graphics
> >drivers we add for all the "j7" family, but what we really want is only
> >for some specific j7 SoCs.
> >
> >First step in untangling this is to make it clear that there is no SoC
> >called "j7". There is a SoC called j721e with a j721e-evm.
> >
> >Fix up this naming here.
> >
> >Signed-off-by: Andrew Davis <afd@ti.com>
> >---
> >  .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
> >  conf/machine/{j7-evm.conf => j721e-evm.conf}   |  4 ++--
> >  ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
> >  ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
> >  .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
> >  .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
> >  .../ti-img-rogue-driver_1.15.6133109.bb        | 10 +++++-----
> >  recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
> >  .../viddec-test-app_1.0.0.bb                   |  2 +-
> >  .../videnc-test-app_1.0.0.bb                   |  2 +-
> >  recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 +++++++++---------
> >  .../trusted-firmware-a_%.bbappend              |  2 +-
> >  .../ti-img-rogue-umlibs_1.15.6133109.bb        |  6 +++---
> >  recipes-kernel/linux/kernel-rdepends.inc       |  4 ++--
> >  recipes-security/optee/optee-os_%.bbappend     |  2 +-
> >  recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
> >  16 files changed, 40 insertions(+), 40 deletions(-)
> >  rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
> >  rename conf/machine/{j7-evm.conf => j721e-evm.conf} (87%)
> >  rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%)
> >  rename conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (81%)
> >  rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)
> >
> >diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j721e-evm-k3r5.conf
> >similarity index 81%
> >rename from conf/machine/j7-evm-k3r5.conf
> >rename to conf/machine/j721e-evm-k3r5.conf
> 
> 
> So this changes the name of the yocto build machine label...  This
> will be impactful to users used to building j7-evm and for our build
> and testing scripts.  I will need to test this and work with Minas
> to make changes on the testing side before I can merge it in.

Right. This was a good and timely change for kirkstone, but is it worth the 
effort for dunfell? Supposed to be a stable release branch and avoid breakages 
like this...

-- 
Denys

Re: [meta-ti][dunfell][PATCH 1/3] meta-ti: Rename j7-evm to j721e-evm

[Andrew Davis]

On 9/1/22 11:10 AM, Denys Dmytriyenko wrote:
> On Thu, Sep 01, 2022 at 10:31:42AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>>
>>
>> On 8/31/2022 12:53, Andrew Davis wrote:
>>> In many places we use "j7" (the family name) when we should be using a
>>> specific SoC or EVM and vice-versa. For instance when including graphics
>>> drivers we add for all the "j7" family, but what we really want is only
>>> for some specific j7 SoCs.
>>>
>>> First step in untangling this is to make it clear that there is no SoC
>>> called "j7". There is a SoC called j721e with a j721e-evm.
>>>
>>> Fix up this naming here.
>>>
>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>> ---
>>>   .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
>>>   conf/machine/{j7-evm.conf => j721e-evm.conf}   |  4 ++--
>>>   ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
>>>   ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
>>>   .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
>>>   .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
>>>   .../ti-img-rogue-driver_1.15.6133109.bb        | 10 +++++-----
>>>   recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
>>>   .../viddec-test-app_1.0.0.bb                   |  2 +-
>>>   .../videnc-test-app_1.0.0.bb                   |  2 +-
>>>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 +++++++++---------
>>>   .../trusted-firmware-a_%.bbappend              |  2 +-
>>>   .../ti-img-rogue-umlibs_1.15.6133109.bb        |  6 +++---
>>>   recipes-kernel/linux/kernel-rdepends.inc       |  4 ++--
>>>   recipes-security/optee/optee-os_%.bbappend     |  2 +-
>>>   recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
>>>   16 files changed, 40 insertions(+), 40 deletions(-)
>>>   rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
>>>   rename conf/machine/{j7-evm.conf => j721e-evm.conf} (87%)
>>>   rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%)
>>>   rename conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (81%)
>>>   rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)
>>>
>>> diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j721e-evm-k3r5.conf
>>> similarity index 81%
>>> rename from conf/machine/j7-evm-k3r5.conf
>>> rename to conf/machine/j721e-evm-k3r5.conf
>>
>>
>> So this changes the name of the yocto build machine label...  This
>> will be impactful to users used to building j7-evm and for our build
>> and testing scripts.  I will need to test this and work with Minas
>> to make changes on the testing side before I can merge it in.
> 
> Right. This was a good and timely change for kirkstone, but is it worth the
> effort for dunfell? Supposed to be a stable release branch and avoid breakages
> like this...
> 

I did consider that, but it seems we will be on dunfell for a little bit
longer than I expected. If we have plans to move to kirkstone in the
near future I'd have been okay with this fix only on kirkstone/master.

Holding off on valid fixes because we are waiting for a next version we
don't plan to switch to for a month+ is not a good strategy.

Re: [meta-ti][dunfell][PATCH 1/3] meta-ti: Rename j7-evm to j721e-evm

[Ryan Eatmon]

On 9/1/2022 11:20, Andrew Davis wrote:
> On 9/1/22 11:10 AM, Denys Dmytriyenko wrote:
>> On Thu, Sep 01, 2022 at 10:31:42AM -0500, Ryan Eatmon via 
>> lists.yoctoproject.org wrote:
>>>
>>>
>>> On 8/31/2022 12:53, Andrew Davis wrote:
>>>> In many places we use "j7" (the family name) when we should be using a
>>>> specific SoC or EVM and vice-versa. For instance when including 
>>>> graphics
>>>> drivers we add for all the "j7" family, but what we really want is only
>>>> for some specific j7 SoCs.
>>>>
>>>> First step in untangling this is to make it clear that there is no SoC
>>>> called "j7". There is a SoC called j721e with a j721e-evm.
>>>>
>>>> Fix up this naming here.
>>>>
>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>> ---
>>>>   .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
>>>>   conf/machine/{j7-evm.conf => j721e-evm.conf}   |  4 ++--
>>>>   ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
>>>>   ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
>>>>   .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
>>>>   .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
>>>>   .../ti-img-rogue-driver_1.15.6133109.bb        | 10 +++++-----
>>>>   recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
>>>>   .../viddec-test-app_1.0.0.bb                   |  2 +-
>>>>   .../videnc-test-app_1.0.0.bb                   |  2 +-
>>>>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 
>>>> +++++++++---------
>>>>   .../trusted-firmware-a_%.bbappend              |  2 +-
>>>>   .../ti-img-rogue-umlibs_1.15.6133109.bb        |  6 +++---
>>>>   recipes-kernel/linux/kernel-rdepends.inc       |  4 ++--
>>>>   recipes-security/optee/optee-os_%.bbappend     |  2 +-
>>>>   recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
>>>>   16 files changed, 40 insertions(+), 40 deletions(-)
>>>>   rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
>>>>   rename conf/machine/{j7-evm.conf => j721e-evm.conf} (87%)
>>>>   rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => 
>>>> j721e-hs-evm-k3r5-sr1-1.conf} (53%)
>>>>   rename conf/machine/{j7-hs-evm-k3r5.conf => 
>>>> j721e-hs-evm-k3r5.conf} (81%)
>>>>   rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)
>>>>
>>>> diff --git a/conf/machine/j7-evm-k3r5.conf 
>>>> b/conf/machine/j721e-evm-k3r5.conf
>>>> similarity index 81%
>>>> rename from conf/machine/j7-evm-k3r5.conf
>>>> rename to conf/machine/j721e-evm-k3r5.conf
>>>
>>>
>>> So this changes the name of the yocto build machine label...  This
>>> will be impactful to users used to building j7-evm and for our build
>>> and testing scripts.  I will need to test this and work with Minas
>>> to make changes on the testing side before I can merge it in.
>>
>> Right. This was a good and timely change for kirkstone, but is it 
>> worth the
>> effort for dunfell? Supposed to be a stable release branch and avoid 
>> breakages
>> like this...
>>
> 
> I did consider that, but it seems we will be on dunfell for a little bit
> longer than I expected. If we have plans to move to kirkstone in the
> near future I'd have been okay with this fix only on kirkstone/master.
> 
> Holding off on valid fixes because we are waiting for a next version we
> don't plan to switch to for a month+ is not a good strategy.


Is it possible to change the name of MACHINE after the code starts?  So 
that from the outside we call it j7-evm, but internally in the recipes 
we drop the j7 and go to j721e?  For dunfell, but for kirkstone we can 
change the conf file name too?



-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

Re: [meta-ti][dunfell][PATCH 1/3] meta-ti: Rename j7-evm to j721e-evm

[Andrew Davis]

On 9/1/22 11:33 AM, Ryan Eatmon wrote:
> 
> 
> On 9/1/2022 11:20, Andrew Davis wrote:
>> On 9/1/22 11:10 AM, Denys Dmytriyenko wrote:
>>> On Thu, Sep 01, 2022 at 10:31:42AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>>>>
>>>>
>>>> On 8/31/2022 12:53, Andrew Davis wrote:
>>>>> In many places we use "j7" (the family name) when we should be using a
>>>>> specific SoC or EVM and vice-versa. For instance when including graphics
>>>>> drivers we add for all the "j7" family, but what we really want is only
>>>>> for some specific j7 SoCs.
>>>>>
>>>>> First step in untangling this is to make it clear that there is no SoC
>>>>> called "j7". There is a SoC called j721e with a j721e-evm.
>>>>>
>>>>> Fix up this naming here.
>>>>>
>>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>>> ---
>>>>>   .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
>>>>>   conf/machine/{j7-evm.conf => j721e-evm.conf}   |  4 ++--
>>>>>   ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
>>>>>   ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
>>>>>   .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
>>>>>   .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
>>>>>   .../ti-img-rogue-driver_1.15.6133109.bb        | 10 +++++-----
>>>>>   recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
>>>>>   .../viddec-test-app_1.0.0.bb                   |  2 +-
>>>>>   .../videnc-test-app_1.0.0.bb                   |  2 +-
>>>>>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 +++++++++---------
>>>>>   .../trusted-firmware-a_%.bbappend              |  2 +-
>>>>>   .../ti-img-rogue-umlibs_1.15.6133109.bb        |  6 +++---
>>>>>   recipes-kernel/linux/kernel-rdepends.inc       |  4 ++--
>>>>>   recipes-security/optee/optee-os_%.bbappend     |  2 +-
>>>>>   recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
>>>>>   16 files changed, 40 insertions(+), 40 deletions(-)
>>>>>   rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
>>>>>   rename conf/machine/{j7-evm.conf => j721e-evm.conf} (87%)
>>>>>   rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%)
>>>>>   rename conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (81%)
>>>>>   rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)
>>>>>
>>>>> diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j721e-evm-k3r5.conf
>>>>> similarity index 81%
>>>>> rename from conf/machine/j7-evm-k3r5.conf
>>>>> rename to conf/machine/j721e-evm-k3r5.conf
>>>>
>>>>
>>>> So this changes the name of the yocto build machine label...  This
>>>> will be impactful to users used to building j7-evm and for our build
>>>> and testing scripts.  I will need to test this and work with Minas
>>>> to make changes on the testing side before I can merge it in.
>>>
>>> Right. This was a good and timely change for kirkstone, but is it worth the
>>> effort for dunfell? Supposed to be a stable release branch and avoid breakages
>>> like this...
>>>
>>
>> I did consider that, but it seems we will be on dunfell for a little bit
>> longer than I expected. If we have plans to move to kirkstone in the
>> near future I'd have been okay with this fix only on kirkstone/master.
>>
>> Holding off on valid fixes because we are waiting for a next version we
>> don't plan to switch to for a month+ is not a good strategy.
> 
> 
> Is it possible to change the name of MACHINE after the code starts?  So that from the outside we call it j7-evm, but internally in the recipes we drop the j7 and go to j721e?  For dunfell, but for kirkstone we can change the conf file name too?
> 
> 

Do we gain much from that outside of not needing to change the command in the build/test farm?

We already made this change in kirkstone, this is basically a backport (I didn't
call it such as it is a bit different due to how much has changed between dunfell
and kirkstone).

We will need to update the processor docs in a couple spots but I can handle that
before the next Jacinto targeting release.

Re: [meta-ti][dunfell][PATCH 1/3] meta-ti: Rename j7-evm to j721e-evm

[Ryan Eatmon]

On 9/1/2022 11:45, Andrew Davis wrote:
> On 9/1/22 11:33 AM, Ryan Eatmon wrote:
>>
>>
>> On 9/1/2022 11:20, Andrew Davis wrote:
>>> On 9/1/22 11:10 AM, Denys Dmytriyenko wrote:
>>>> On Thu, Sep 01, 2022 at 10:31:42AM -0500, Ryan Eatmon via 
>>>> lists.yoctoproject.org wrote:
>>>>>
>>>>>
>>>>> On 8/31/2022 12:53, Andrew Davis wrote:
>>>>>> In many places we use "j7" (the family name) when we should be 
>>>>>> using a
>>>>>> specific SoC or EVM and vice-versa. For instance when including 
>>>>>> graphics
>>>>>> drivers we add for all the "j7" family, but what we really want is 
>>>>>> only
>>>>>> for some specific j7 SoCs.
>>>>>>
>>>>>> First step in untangling this is to make it clear that there is no 
>>>>>> SoC
>>>>>> called "j7". There is a SoC called j721e with a j721e-evm.
>>>>>>
>>>>>> Fix up this naming here.
>>>>>>
>>>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>>>> ---
>>>>>>   .../{j7-evm-k3r5.conf => j721e-evm-k3r5.conf}  |  4 ++--
>>>>>>   conf/machine/{j7-evm.conf => j721e-evm.conf}   |  4 ++--
>>>>>>   ...sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} |  6 +++---
>>>>>>   ...hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} |  4 ++--
>>>>>>   .../{j7-hs-evm.conf => j721e-hs-evm.conf}      |  6 +++---
>>>>>>   .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb     |  2 +-
>>>>>>   .../ti-img-rogue-driver_1.15.6133109.bb        | 10 +++++-----
>>>>>>   recipes-bsp/sciclient/sciclient-rtos_git.bb    |  6 +++---
>>>>>>   .../viddec-test-app_1.0.0.bb                   |  2 +-
>>>>>>   .../videnc-test-app_1.0.0.bb                   |  2 +-
>>>>>>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb         | 18 
>>>>>> +++++++++---------
>>>>>>   .../trusted-firmware-a_%.bbappend              |  2 +-
>>>>>>   .../ti-img-rogue-umlibs_1.15.6133109.bb        |  6 +++---
>>>>>>   recipes-kernel/linux/kernel-rdepends.inc       |  4 ++--
>>>>>>   recipes-security/optee/optee-os_%.bbappend     |  2 +-
>>>>>>   recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb     |  2 +-
>>>>>>   16 files changed, 40 insertions(+), 40 deletions(-)
>>>>>>   rename conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (81%)
>>>>>>   rename conf/machine/{j7-evm.conf => j721e-evm.conf} (87%)
>>>>>>   rename conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => 
>>>>>> j721e-hs-evm-k3r5-sr1-1.conf} (53%)
>>>>>>   rename conf/machine/{j7-hs-evm-k3r5.conf => 
>>>>>> j721e-hs-evm-k3r5.conf} (81%)
>>>>>>   rename conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (85%)
>>>>>>
>>>>>> diff --git a/conf/machine/j7-evm-k3r5.conf 
>>>>>> b/conf/machine/j721e-evm-k3r5.conf
>>>>>> similarity index 81%
>>>>>> rename from conf/machine/j7-evm-k3r5.conf
>>>>>> rename to conf/machine/j721e-evm-k3r5.conf
>>>>>
>>>>>
>>>>> So this changes the name of the yocto build machine label...  This
>>>>> will be impactful to users used to building j7-evm and for our build
>>>>> and testing scripts.  I will need to test this and work with Minas
>>>>> to make changes on the testing side before I can merge it in.
>>>>
>>>> Right. This was a good and timely change for kirkstone, but is it 
>>>> worth the
>>>> effort for dunfell? Supposed to be a stable release branch and avoid 
>>>> breakages
>>>> like this...
>>>>
>>>
>>> I did consider that, but it seems we will be on dunfell for a little bit
>>> longer than I expected. If we have plans to move to kirkstone in the
>>> near future I'd have been okay with this fix only on kirkstone/master.
>>>
>>> Holding off on valid fixes because we are waiting for a next version we
>>> don't plan to switch to for a month+ is not a good strategy.
>>
>>
>> Is it possible to change the name of MACHINE after the code starts?  
>> So that from the outside we call it j7-evm, but internally in the 
>> recipes we drop the j7 and go to j721e?  For dunfell, but for 
>> kirkstone we can change the conf file name too?
>>
>>
> 
> Do we gain much from that outside of not needing to change the command 
> in the build/test farm?
> 
> We already made this change in kirkstone, this is basically a backport 
> (I didn't
> call it such as it is a bit different due to how much has changed 
> between dunfell
> and kirkstone).
> 
> We will need to update the processor docs in a couple spots but I can 
> handle that
> before the next Jacinto targeting release.


Have you communicated this change with the Jacinto team?  This change 
goes beyond just me changing some build scripts.  They have their own 
build scripts.  Are they ok with this change?


-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS