aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYogesh Siraswar <yogeshs@ti.com>2021-11-19 22:26:07 -0500
committerRyan Eatmon <reatmon@ti.com>2021-12-15 11:40:51 -0600
commitbdceaa05aca9d3685ebfefbe7b7b60e2fd33789f (patch)
tree2b2f8dc1fe0c35d2fa39f013e5be3b38dd2a4c74
parentc5e541918b8b909a0ce5d389fe26a72076bc4992 (diff)
downloadmeta-ti-bdceaa05aca9d3685ebfefbe7b7b60e2fd33789f.tar.gz
meta-ti-bdceaa05aca9d3685ebfefbe7b7b60e2fd33789f.tar.bz2
meta-ti-bdceaa05aca9d3685ebfefbe7b7b60e2fd33789f.zip
j721e-sr1_1: Add j721e sr1.1 HS support
This patch adds support for J721e HS SR1.1 HS SR1.1 requires updated sysfw binary. Both SR1.0 and SR1.1 sysfw binary will be generated. sysfw.itb will point to SR1.1 This patch requires J7 SR 1.1 support in K3 Image gen. Signed-off-by: Yogesh Siraswar <yogeshs@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--conf/machine/j7-hs-evm-k3r5-sr1-1.conf11
-rw-r--r--conf/machine/j7-hs-evm.conf8
-rw-r--r--conf/multiconfig/k3r5-sr1-1.conf3
-rw-r--r--recipes-bsp/ti-linux-fw/ti-linux-fw.inc2
-rw-r--r--recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb1
5 files changed, 24 insertions, 1 deletions
diff --git a/conf/machine/j7-hs-evm-k3r5-sr1-1.conf b/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
new file mode 100644
index 00000000..73f5afd6
--- /dev/null
+++ b/conf/machine/j7-hs-evm-k3r5-sr1-1.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J7 SR1.1 HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J7 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
+SOC_FAMILY:append = ":k3r5-sr1-1"
+
+SYSFW_SOC = "j721e_sr1_1"
+SYSFW_SYMLINK = "sysfw.itb"
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
index 70e14754..ab0fa474 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-hs-evm.conf
@@ -19,4 +19,12 @@ SPL_BINARYNAME = "tispl.bin"
UBOOT_BINARY = "u-boot.img_HS"
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
+IMAGE_BOOT_FILES += "sysfw-j7-hs-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"
+
TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/multiconfig/k3r5-sr1-1.conf b/conf/multiconfig/k3r5-sr1-1.conf
new file mode 100644
index 00000000..428f2212
--- /dev/null
+++ b/conf/multiconfig/k3r5-sr1-1.conf
@@ -0,0 +1,3 @@
+require k3r5.conf
+
+MACHINE:append = "-sr1-1"
diff --git a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index f6d5b8d1..d224f353 100644
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -23,7 +23,7 @@ SRCREV = "${TI_LINUX_FW_SRCREV}"
BRANCH ?= "ti-linux-firmware"
-K3_IMAGE_GEN_SRCREV ?= "6baabef219aea0f667423f2cab2bc2d63a349488"
+K3_IMAGE_GEN_SRCREV ?= "489c767a153ff26e9230746e04dd4b1ad0809901"
SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
SRCREV_FORMAT = "imggen"
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index f70c3aec..59dd3ee1 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -25,6 +25,7 @@ SYSFW_PREFIX = "ti-sci-firmware"
SYSFW_PREFIX:j7-evm-k3r5 = "ti-fs-firmware"
SYSFW_PREFIX:j7200-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:j7200-hs-evm-k3r5 = "ti-fs-firmware"
SYSFW_SUFFIX ?= "unknown"