| Message ID | 20220325184615.17398-1-afd@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-arago,master,1/2] meta-arago: rename j7-evm to j721e-evm | expand |
On Fri, Mar 25, 2022 at 01:46:14PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote: > 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. > > Signed-off-by: Andrew Davis <afd@ti.com> Tested-by: Denys Dmytriyenko <denys@konsulko.com>
On 3/28/2022 11:51 PM, Denys Dmytriyenko wrote: > On Fri, Mar 25, 2022 at 01:46:14PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote: >> 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. >> >> Signed-off-by: Andrew Davis <afd@ti.com> > > Tested-by: Denys Dmytriyenko <denys@konsulko.com> Applied patch to master.
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index d3f03f2e..b2246537 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -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 diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb index feff7842..36693ab0 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb @@ -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}" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb index 8d7cad24..a741eb03 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb @@ -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 \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb index 600da50f..363602b5 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb @@ -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" diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image index 96efa538..cee03bc2 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_sysfw-image @@ -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 diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb index c8b19d58..85b99bf2 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb @@ -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__ diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend index 5975b92e..de9f1c7d 100644 --- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend +++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend @@ -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} \ "
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. Signed-off-by: Andrew Davis <afd@ti.com> --- 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(-)