Skip to contentSkip to conversation

meta-arago: rename j7-evm to j721e-evm

PATCH Applied Andrew Davis 3 participants 6 messages Mar 25, 2022 – Mar 29, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 meta-arago: rename j7-evm to j721e-evm

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

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.

---
 meta-arago-distro/conf/distro/arago.conf                    | 4 ++--
 meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb  | 6 +++---
 .../packagegroup-arago-tisdk-addons-sdk-host.bb             | 4 ++--
 .../packagegroups/packagegroup-arago-tisdk-addons.bb        | 4 ++--
 .../ti-tisdk-makefile/Makefile_sysfw-image                  | 6 +++---
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb              | 4 ++--
 .../gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend      | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)
meta-arago-distro/conf/distro/arago.conf +2 -2
index d3f03f2e..b2246537 100644
@@ -49,12 +49,12 @@ KERNEL_IMAGETYPES:dra7xx-hs-evm = "zImage fitImage"
 # FIT image for K3 secure devices
 KERNEL_CLASSES:append:am64xx-hs-evm = " kernel-fitimage"
 KERNEL_CLASSES:append:am65xx-hs-evm = " kernel-fitimage"
-KERNEL_CLASSES:append:j7-hs-evm = " kernel-fitimage"
+KERNEL_CLASSES:append:j721e-hs-evm = " kernel-fitimage"
 KERNEL_CLASSES:append:j7200-hs-evm = " kernel-fitimage"
 
 KERNEL_IMAGETYPES:am64xx-hs-evm = "Image fitImage"
 KERNEL_IMAGETYPES:am65xx-hs-evm = "Image fitImage"
-KERNEL_IMAGETYPES:j7-hs-evm = "Image fitImage"
+KERNEL_IMAGETYPES:j721e-hs-evm = "Image fitImage"
 KERNEL_IMAGETYPES:j7200-hs-evm = "Image fitImage"
 
 # FIT image settings
meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +3 -3
index feff7842..36693ab0 100644
@@ -5,10 +5,10 @@ DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3.bin"
 
 DEPLOY_IMAGES_NAME:k3 = "bl31.bin bl32.bin"
 DEPLOY_IMAGES_NAME:append:am65xx = " sysfw.itb"
-DEPLOY_IMAGES_NAME:append:j7-evm = " sysfw.itb"
-DEPLOY_IMAGES_NAME:append:j7-hs-evm = " sysfw.itb"
+DEPLOY_IMAGES_NAME:append:j721e-evm = " sysfw.itb"
+DEPLOY_IMAGES_NAME:append:j721e-hs-evm = " sysfw.itb"
 DEPLOY_IMAGES_NAME:append:am65xx-evm = " ti-sci-firmware-am65x-gp.bin sysfw-am65x-evm.itb sysfw-am65x_sr2-evm.itb"
-DEPLOY_IMAGES_NAME:append:j7-evm = " ti-fs-firmware-j721e-gp.bin"
+DEPLOY_IMAGES_NAME:append:j721e-evm = " ti-fs-firmware-j721e-gp.bin"
 
 ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
 export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}"
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +2 -2
index 8d7cad24..a741eb03 100644
@@ -37,11 +37,11 @@ UTILS:append:k3 = " \
     trusted-firmware-a-source \
 "
 
-UTILS:append:j7-evm = " \
+UTILS:append:j721e-evm = " \
     pru-icss-source \
 "
 
-UTILS:append:j7-hs-evm = " \
+UTILS:append:j721e-hs-evm = " \
     pru-icss-source \
 "
 
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +2 -2
index 600da50f..363602b5 100644
@@ -68,8 +68,8 @@ UTILS:append:am64xx = " ti-rtos-firmware pru-icss"
 #UTILS:append:am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
 UTILS:append:am65xx = " ti-rtos-firmware pru-icss"
 UTILS:append:j7 = " ti-rtos-firmware"
-UTILS:append:j7-evm = " pru-icss"
-UTILS:append:j7-hs-evm = " pru-icss"
+UTILS:append:j721e-evm = " pru-icss"
+UTILS:append:j721e-hs-evm = " pru-icss"
 
 UTILS:append:omapl138 = " ti-ipc-rtos-fw"
 
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image +3 -3
index 96efa538..cee03bc2 100644
@@ -1,7 +1,7 @@
 # Define the following to support multple platforms
 PLATFORM_TYPE_$(PLATFORM) = gp
 PLATFORM_TYPE_am65xx-hs-evm = hs
-PLATFORM_TYPE_j7-hs-evm = hs
+PLATFORM_TYPE_j721e-hs-evm = hs
 PLATFORM_TYPE = $(PLATFORM_TYPE_$(PLATFORM))
 
 SYSFW_CONFIG = evm
@@ -9,8 +9,8 @@ SYSFW_CONFIG = evm
 SYSFW_SOC_$(PLATFORM) = NULL
 SYSFW_SOC_am65xx-evm = am65x
 SYSFW_SOC_am65xx-hs-evm = am65x
-SYSFW_SOC_j7-evm = j721e
-SYSFW_SOC_j7-hs-evm = j721e
+SYSFW_SOC_j721e-evm = j721e
+SYSFW_SOC_j721e-hs-evm = j721e
 SYSFW_SOC = $(SYSFW_SOC_$(PLATFORM))
 
 SYSFW_PREFIX = ti-sci-firmware
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +2 -2
index c8b19d58..85b99bf2 100644
@@ -300,8 +300,8 @@ do_install () {
 K3_UBOOT_MACHINE_R5 = ""
 K3_UBOOT_MACHINE_R5:am65xx-evm = "am65x_evm_r5_defconfig"
 K3_UBOOT_MACHINE_R5:am65xx-hs-evm = "am65x_hs_evm_r5_defconfig"
-K3_UBOOT_MACHINE_R5:j7-evm = "j721e_evm_r5_config"
-K3_UBOOT_MACHINE_R5:j7-hs-evm = "j721e_hs_evm_r5_config"
+K3_UBOOT_MACHINE_R5:j721e-evm = "j721e_evm_r5_config"
+K3_UBOOT_MACHINE_R5:j721e-hs-evm = "j721e_hs_evm_r5_config"
 
 do_install:append:k3() {
     cat >> ${D}/Rules.make << __EOF__
meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend +2 -2
index 5975b92e..de9f1c7d 100644
@@ -28,11 +28,11 @@ SRC_URI:append:am65xx = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI:append:j7-evm = " \
+SRC_URI:append:j721e-evm = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI:append:j7-hs-evm = " \
+SRC_URI:append:j721e-hs-evm = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 arago-prefs: only the j721e SoC is currently supported

There are now three SoCs in the J7 family, but only the j721e variant is currently supported. Be specific here.

---
 .../conf/distro/include/arago-prefs.inc              | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-arago-distro/conf/distro/include/arago-prefs.inc +6 -6
index 9c4a533c..65ce2a96 100644
@@ -14,12 +14,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km"
 
-# J7 has a Rogue GPU core
-PREFERRED_PROVIDER_virtual/egl:j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles1:j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgles2:j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/libgbm:j7 = "ti-img-rogue-umlibs"
-PREFERRED_PROVIDER_virtual/gpudriver:j7 = "ti-img-rogue-driver"
+# J721e has a Rogue GPU core
+PREFERRED_PROVIDER_virtual/egl:j721e = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1:j721e = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2:j721e = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm:j721e = "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver:j721e = "ti-img-rogue-driver"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging${ARAGO_KERNEL_SUFFIX}"
 
Signature · 1 line
2.17.1
Applied
#3 lore raw

Re: [meta-arago][master][PATCH 2/2] arago-prefs: only the j721e SoC is currently supported

Quoted 7 lines · Denys Dmytriyenko
Quoted 4 lines · Andrew F. Davis via lists.yoctoproject.org

There are now three SoCs in the J7 family, but only the j721e variant is currently supported. Be specific here.

Applied patch to master.

Signature · 3 lines
Ryan Eatmon    Texas Instruments, Inc.    [email protected]
--------------------------------------------------------
Analog EDA     -    Simulation Development    -     MGTS
Tested-by on v1 1/2
#4 lore raw
In reply to Andrew Davis
Quoted 11 lines · Andrew F. Davis via lists.yoctoproject.org

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

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.

Applied
#5 lore raw
Quoted 6 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew F. Davis via lists.yoctoproject.org

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

Quoted 8 lines
Quoted 6 lines

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.

Applied patch to master.

Signature · 3 lines
Ryan Eatmon    Texas Instruments, Inc.    [email protected]
--------------------------------------------------------
Analog EDA     -    Simulation Development    -     MGTS