From: Andrew Davis <afd@ti.com>
To: Denys Dmytriyenko <denys@konsulko.com>,
Ryan Eatmon <reatmon@ti.com>,
Darren Etheridge <detheridge@ti.com>,
<meta-ti@lists.yoctoproject.org>
Cc: "Andrew F . Davis" <afd@ti.com>
Subject: [meta-ti][master][PATCH 1/4] meta-ti: rename j7-evm to j721e-evm
Date: Fri, 25 Mar 2022 13:41:48 -0500 [thread overview]
Message-ID: <20220325184151.16940-1-afd@ti.com> (raw)
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>
---
.../machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} | 4 ++--
meta-ti-bsp/conf/machine/{j7-evm.conf => j721e-evm.conf} | 4 ++--
...s-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} | 6 +++---
.../{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} | 4 ++--
.../conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} | 8 ++++----
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 +++---
.../trusted-firmware-a/trusted-firmware-a_%.bbappend | 2 +-
meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 2 +-
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
rename meta-ti-bsp/conf/machine/{j7-evm-k3r5.conf => j721e-evm-k3r5.conf} (63%)
rename meta-ti-bsp/conf/machine/{j7-evm.conf => j721e-evm.conf} (82%)
rename meta-ti-bsp/conf/machine/{j7-hs-evm-k3r5-sr1-1.conf => j721e-hs-evm-k3r5-sr1-1.conf} (53%)
rename meta-ti-bsp/conf/machine/{j7-hs-evm-k3r5.conf => j721e-hs-evm-k3r5.conf} (67%)
rename meta-ti-bsp/conf/machine/{j7-hs-evm.conf => j721e-hs-evm.conf} (79%)
diff --git a/meta-ti-bsp/conf/machine/j7-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
similarity index 63%
rename from meta-ti-bsp/conf/machine/j7-evm-k3r5.conf
rename to meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
index b9e8cc01..070bf7aa 100644
--- a/meta-ti-bsp/conf/machine/j7-evm-k3r5.conf
+++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j7-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
similarity index 82%
rename from meta-ti-bsp/conf/machine/j7-evm.conf
rename to meta-ti-bsp/conf/machine/j721e-evm.conf
index 267a5e14..12d4fecb 100644
--- a/meta-ti-bsp/conf/machine/j7-evm.conf
+++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5-sr1-1.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf
similarity index 53%
rename from meta-ti-bsp/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
rename to meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf
index 73f5afd6..6e809f46 100644
--- a/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
+++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
similarity index 67%
rename from meta-ti-bsp/conf/machine/j7-hs-evm-k3r5.conf
rename to meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
index 53a7016f..80f3b969 100644
--- a/meta-ti-bsp/conf/machine/j7-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j7-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
similarity index 79%
rename from meta-ti-bsp/conf/machine/j7-hs-evm.conf
rename to meta-ti-bsp/conf/machine/j721e-hs-evm.conf
index f2e3ccf5..433863dd 100644
--- a/meta-ti-bsp/conf/machine/j7-hs-evm.conf
+++ b/meta-ti-bsp/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"
@@ -22,7 +22,7 @@ IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
BBMULTICONFIG += "k3r5-sr1-1"
# Use default IMAGE_BOOT_FILES_LEGACY files
-# Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0
+# 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"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 3d50b112..33333e3c 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -23,9 +23,9 @@ SYSFW_SOC ?= "unknown"
SYSFW_CONFIG ?= "unknown"
SYSFW_PREFIX = "ti-sci-firmware"
-SYSFW_PREFIX:j7-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:j7-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware"
+SYSFW_PREFIX:j721e-evm-k3r5 = "ti-fs-firmware"
+SYSFW_PREFIX:j721e-hs-evm-k3r5 = "ti-fs-firmware"
+SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "ti-fs-firmware"
SYSFW_PREFIX:j7200-evm-k3r5 = "ti-fs-firmware"
SYSFW_PREFIX:j7200-hs-evm-k3r5 = "ti-fs-firmware"
SYSFW_PREFIX:j721s2-evm-k3r5 = "ti-fs-firmware"
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 581f7454..35cb9c95 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -26,7 +26,7 @@ do_compile:append:am64xx-hs-evm() {
)
}
-do_compile:append:j7-hs-evm() {
+do_compile:append:j721e-hs-evm() {
export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
( cd ${BUILD_DIR}; \
mv bl31.bin bl31.bin.unsigned; \
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
index f1d7fc9a..f9660bfe 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
@@ -55,7 +55,7 @@ do_compile:append:am64xx-hs-evm() {
optee_sign_k3hs
}
-do_compile:append:j7-hs-evm() {
+do_compile:append:j721e-hs-evm() {
optee_sign_k3hs
}
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 8aa823cc..03408528 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -49,7 +49,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
-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.17.1
next reply other threads:[~2022-03-25 18:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 18:41 Andrew Davis [this message]
2022-03-25 18:41 ` [meta-ti][master][PATCH 2/4] meta-ti-bsp: add SoC families for the J7 SoCs Andrew Davis
2022-03-29 4:50 ` Denys Dmytriyenko
2022-03-29 12:39 ` Ryan Eatmon
2022-03-25 18:41 ` [meta-ti][master][PATCH 3/4] ti-img-rogue-umlibs: only the j721e SoC is currently supported Andrew Davis
2022-03-29 4:50 ` Denys Dmytriyenko
2022-03-29 12:39 ` Ryan Eatmon
2022-03-25 18:41 ` [meta-ti][master][PATCH 4/4] ti-sgx-ddk-um: only the am65xx member of the k3 family is supported Andrew Davis
2022-03-29 4:50 ` Denys Dmytriyenko
2022-03-29 12:39 ` Ryan Eatmon
2022-03-25 19:23 ` [meta-ti][master][PATCH 1/4] meta-ti: rename j7-evm to j721e-evm Denys Dmytriyenko
2022-03-25 19:38 ` Andrew Davis
2022-03-29 4:48 ` Denys Dmytriyenko
2022-03-29 4:49 ` Denys Dmytriyenko
2022-03-29 12:39 ` Ryan Eatmon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220325184151.16940-1-afd@ti.com \
--to=afd@ti.com \
--cc=denys@konsulko.com \
--cc=detheridge@ti.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=reatmon@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).