Skip to contentSkip to conversation

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

PATCH New Andrew Davis 1 participant 2 messages Aug 31, 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 name) 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                    | 2 +-
 meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb  | 4 ++--
 .../packagegroup-arago-tisdk-addons-sdk-host.bb             | 4 ++--
 .../packagegroups/packagegroup-arago-tisdk-addons.bb        | 4 ++--
 meta-arago-distro/recipes-core/packagegroups/ti-test.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 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)
meta-arago-distro/conf/distro/arago.conf +1 -1
index 5fca73ba..c2f7c603 100644
@@ -51,7 +51,7 @@ KERNEL_IMAGETYPES_am437x-hs-evm = "zImage fitImage"
 KERNEL_IMAGETYPES_am335x-hs-evm = "zImage fitImage"
 KERNEL_IMAGETYPES_am65xx-hs-evm = "Image fitImage"
 KERNEL_IMAGETYPES_am64xx-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"
 KERNEL_IMAGETYPES_j721s2-hs-evm = "Image fitImage"
 
meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +2 -2
index 6df454fc..6b3745f4 100644
@@ -17,8 +17,8 @@ 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 = " sysfw-am65x-evm.itb sysfw-am65x_sr2-evm.itb"
 
 ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +2 -2
index 062948d0..bd72b7d9 100644
@@ -41,11 +41,11 @@ UTILS_append_k3 = " \
     trusted-firmware-a-src \
 "
 
-UTILS_append_j7-evm = " \
+UTILS_append_j721e-evm = " \
     pru-icss-src \
 "
 
-UTILS_append_j7-hs-evm = " \
+UTILS_append_j721e-hs-evm = " \
     pru-icss-src \
 "
 
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +2 -2
index 094c47a2..8a56a235 100644
@@ -68,8 +68,8 @@ UTILS_append_am64xx = " ti-rtos-firmware pru-icss"
 UTILS_append_am62xx = " ti-rtos-firmware pru-icss"
 UTILS_append_am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
 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-core/packagegroups/ti-test.bb +2 -2
index 5c33f5aa..42de2614 100644
@@ -84,12 +84,12 @@ ARAGO_TI_TEST_append_j7 = " \
     ufs-utils \
 "
 
-ARAGO_TI_TEST_append_j7-evm = " \
+ARAGO_TI_TEST_append_j721e-evm = " \
     viddec-test-app \
     videnc-test-app \
 "
 
-ARAGO_TI_TEST_append_j7-hs-evm = " \
+ARAGO_TI_TEST_append_j721e-hs-evm = " \
     viddec-test-app \
     videnc-test-app \
 "
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image +3 -3
index 08d80c35..cbb20c51 100644
@@ -2,7 +2,7 @@
 PLATFORM_TYPE_$(PLATFORM) = gp
 PLATFORM_TYPE_am64xx-hs-evm = hs
 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
@@ -13,8 +13,8 @@ SYSFW_SOC_am65xx-hs-evm = am65x
 SYSFW_SOC_am64xx-evm = am64x
 SYSFW_SOC_am64xx-hs-evm = am64x
 SYSFW_SOC_am62xx-evm = am62x
-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_$(SYSFW_SOC) = ti-sci-firmware
meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +2 -2
index 471e2776..5794e67e 100644
@@ -370,8 +370,8 @@ 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_am64xx-evm = "am64x_evm_r5_defconfig"
 K3_UBOOT_MACHINE_R5_am64xx-hs-evm = "am64x_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"
 K3_UBOOT_MACHINE_R5_j7200-evm = "j7200_evm_r5_config"
 K3_UBOOT_MACHINE_R5_j721s2-evm = "j721s2_evm_r5_config"
 K3_UBOOT_MACHINE_R5_am62xx-evm = "am62x_evm_r5_config"
meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend +2 -2
index 64929729..258bf733 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.36.1
#1 lore raw

PATCH 2/2 meta-arago: Use new J7 SoC names over specific board names

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.

---
 meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb | 3 +--
 .../packagegroup-arago-tisdk-addons-sdk-host.bb            | 6 +-----
 .../packagegroups/packagegroup-arago-tisdk-addons.bb       | 3 +--
 meta-arago-distro/recipes-core/packagegroups/ti-test.bb    | 7 +------
 .../gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend     | 6 +-----
 5 files changed, 5 insertions(+), 20 deletions(-)
meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +1 -2
index 6b3745f4..58d5b09d 100644
@@ -17,8 +17,7 @@ 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_j721e-evm = " sysfw.itb"
-DEPLOY_IMAGES_NAME_append_j721e-hs-evm = " sysfw.itb"
+DEPLOY_IMAGES_NAME_append_j721e = " sysfw.itb"
 DEPLOY_IMAGES_NAME_append_am65xx-evm = " sysfw-am65x-evm.itb sysfw-am65x_sr2-evm.itb"
 
 ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +1 -5
index bd72b7d9..593b9191 100644
@@ -41,11 +41,7 @@ UTILS_append_k3 = " \
     trusted-firmware-a-src \
 "
 
-UTILS_append_j721e-evm = " \
-    pru-icss-src \
-"
-
-UTILS_append_j721e-hs-evm = " \
+UTILS_append_j721e = " \
     pru-icss-src \
 "
 
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +1 -2
index 8a56a235..5273ca08 100644
@@ -68,8 +68,7 @@ UTILS_append_am64xx = " ti-rtos-firmware pru-icss"
 UTILS_append_am62xx = " ti-rtos-firmware pru-icss"
 UTILS_append_am65xx = " ti-rtos-firmware pru-icss pru-pwm-fw"
 UTILS_append_j7 = " ti-rtos-firmware"
-UTILS_append_j721e-evm = " pru-icss"
-UTILS_append_j721e-hs-evm = " pru-icss"
+UTILS_append_j721e = " pru-icss"
 
 UTILS_append_omapl138 = " ti-ipc-rtos-fw"
 
meta-arago-distro/recipes-core/packagegroups/ti-test.bb +1 -6
index 42de2614..1aeb8d12 100644
@@ -84,12 +84,7 @@ ARAGO_TI_TEST_append_j7 = " \
     ufs-utils \
 "
 
-ARAGO_TI_TEST_append_j721e-evm = " \
-    viddec-test-app \
-    videnc-test-app \
-"
-
-ARAGO_TI_TEST_append_j721e-hs-evm = " \
+ARAGO_TI_TEST_append_j721e = " \
     viddec-test-app \
     videnc-test-app \
 "
meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend +1 -5
index 258bf733..eb7098e5 100644
@@ -28,11 +28,7 @@ SRC_URI_append_am65xx = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
-SRC_URI_append_j721e-evm = " \
-    ${GSTDRM_WAYLANDSINK_PATCHES} \
-"
-
-SRC_URI_append_j721e-hs-evm = " \
+SRC_URI_append_j721e = " \
     ${GSTDRM_WAYLANDSINK_PATCHES} \
 "
 
Signature · 1 line
2.36.1