diff options
| -rw-r--r-- | conf/machine/j7-hs-evm-k3r5-sr1-1.conf | 11 | ||||
| -rw-r--r-- | conf/machine/j7-hs-evm.conf | 8 | ||||
| -rw-r--r-- | conf/multiconfig/k3r5-sr1-1.conf | 3 | ||||
| -rw-r--r-- | recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 | ||||
| -rw-r--r-- | recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 |
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" |