mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-05 10:21:52 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2022-03-25 13:41:48 -05:00
committed by Ryan Eatmon
parent f1b6ff1503
commit 8cc837d238
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/j7-evm-k3r5.conf → meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
+2 -2
View File
@@ -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
meta-ti-bsp/conf/machine/j7-evm.conf → meta-ti-bsp/conf/machine/j721e-evm.conf
+2 -2
View File
@@ -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
meta-ti-bsp/conf/machine/j7-hs-evm-k3r5-sr1-1.conf → meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf
+3 -3
View File
@@ -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"
meta-ti-bsp/conf/machine/j7-hs-evm-k3r5.conf → meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
+2 -2
View File
@@ -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
meta-ti-bsp/conf/machine/j7-hs-evm.conf → meta-ti-bsp/conf/machine/j721e-hs-evm.conf
+4 -4
View File
@@ -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"
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+3 -3
View File
@@ -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"
meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+1 -1
View File
@@ -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; \
meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+1 -1
View File
@@ -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
}
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+1 -1
View File
@@ -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; \