diff options
author | Dasnavis <sabiya.d@ti.com> | 2023-02-15 14:56:18 +0530 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-02-15 07:41:55 -0600 |
commit | c51d326243d57b6a9895130e924a48501ebe0dee (patch) | |
tree | 9eb9ac85eedb3e5a83606a57f4980882bc2b9ade | |
parent | 2bf12f5449405c6e1600775dee7e3a08f3ab623b (diff) | |
download | meta-ti-c51d326243d57b6a9895130e924a48501ebe0dee.tar.gz |
conf: machine: j784s4-evm: Add support for J784S4 HS-FS
Add the basic J784S4 HS-FS configuration.
* Add configurations to support both HS-FS and GP keeping GP as default.
* Add ti-sci-firmware overrides for HS-FS.
* Remove evm conf file inclusion in hs-evm conf.
* Add j784s4 hs-evm specific config to hs-evm conf.
Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | conf/machine/j784s4-evm-k3r5-gp.conf | 20 | ||||
-rw-r--r-- | conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf | 16 | ||||
-rw-r--r-- | conf/machine/j784s4-evm.conf | 13 | ||||
-rw-r--r-- | conf/machine/j784s4-hs-evm.conf | 19 | ||||
-rw-r--r-- | recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 |
5 files changed, 66 insertions, 5 deletions
diff --git a/conf/machine/j784s4-evm-k3r5-gp.conf b/conf/machine/j784s4-evm-k3r5-gp.conf new file mode 100644 index 00000000..5fd47b70 --- /dev/null +++ b/conf/machine/j784s4-evm-k3r5-gp.conf | |||
@@ -0,0 +1,20 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: J784S4 GP EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI J784S4 GP EVM (R5F core) | ||
4 | |||
5 | # Booting GP requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY_append = ":k3r5-gp" | ||
9 | |||
10 | SYSFW_SOC = "j784s4" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "gp" | ||
13 | SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" | ||
14 | |||
15 | UBOOT_MACHINE = "j784s4_evm_r5_defconfig" | ||
16 | |||
17 | SPL_BINARY = "" | ||
18 | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | ||
19 | UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" | ||
20 | UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" | ||
diff --git a/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf new file mode 100644 index 00000000..a81063bc --- /dev/null +++ b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf | |||
@@ -0,0 +1,16 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: J784S4 HS-FS EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI J784S4 HS-FS EVM (R5F core) | ||
4 | |||
5 | # Booting HS-FS requires different SYSFW, the rest is handled at runtime | ||
6 | |||
7 | require conf/machine/include/k3r5.inc | ||
8 | SOC_FAMILY_append = ":k3r5-sr1-hs-fs" | ||
9 | |||
10 | SYSFW_SOC = "j784s4" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs-fs" | ||
13 | SYSFW_TIBOOT3_SYMLINK = "" | ||
14 | SYSFW_SYMLINK = "" | ||
15 | |||
16 | UBOOT_MACHINE = "j784s4_evm_r5_defconfig" | ||
diff --git a/conf/machine/j784s4-evm.conf b/conf/machine/j784s4-evm.conf index e892f597..c4548520 100644 --- a/conf/machine/j784s4-evm.conf +++ b/conf/machine/j784s4-evm.conf | |||
@@ -39,8 +39,15 @@ KERNEL_DEVICETREE = " \ | |||
39 | 39 | ||
40 | UBOOT_MACHINE = "j784s4_evm_a72_defconfig" | 40 | UBOOT_MACHINE = "j784s4_evm_a72_defconfig" |
41 | 41 | ||
42 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 42 | # Default tiboot3.bin on J784S4 is for GP |
43 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 43 | BBMULTICONFIG = "k3r5-gp" |
44 | do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
45 | do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
44 | 46 | ||
45 | TFA_BOARD = "j784s4" | 47 | # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS |
48 | BBMULTICONFIG += "k3r5-sr1-hs-fs" | ||
49 | IMAGE_BOOT_FILES += " tiboot3-j784s4-hs-fs-evm.bin" | ||
50 | do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" | ||
51 | do_image_tar[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" | ||
46 | 52 | ||
53 | TFA_BOARD = "j784s4" | ||
diff --git a/conf/machine/j784s4-hs-evm.conf b/conf/machine/j784s4-hs-evm.conf index 62357d62..91ef3d6f 100644 --- a/conf/machine/j784s4-hs-evm.conf +++ b/conf/machine/j784s4-hs-evm.conf | |||
@@ -2,10 +2,27 @@ | |||
2 | #@NAME: J784S4 HS EVM | 2 | #@NAME: J784S4 HS EVM |
3 | #@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM | 3 | #@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM |
4 | 4 | ||
5 | require conf/machine/j784s4-evm.conf | 5 | require conf/machine/include/j7.inc |
6 | |||
7 | MACHINE_FEATURES += "gpu" | ||
8 | |||
9 | SERIAL_CONSOLES = "115200;ttyS2" | ||
10 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
11 | TFA_K3_USART = "0x8" | ||
12 | OPTEEMACHINE = "k3-j784s4" | ||
13 | OPTEE_K3_USART = "0x8" | ||
14 | |||
15 | KERNEL_DEVICETREE = " \ | ||
16 | ti/k3-j784s4-evm.dtb \ | ||
17 | " | ||
6 | 18 | ||
7 | UBOOT_MACHINE = "j784s4_evm_a72_defconfig" | 19 | UBOOT_MACHINE = "j784s4_evm_a72_defconfig" |
8 | 20 | ||
21 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | ||
22 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | ||
23 | |||
24 | TFA_BOARD = "j784s4" | ||
25 | |||
9 | SPL_BINARY = "tispl.bin_HS" | 26 | SPL_BINARY = "tispl.bin_HS" |
10 | UBOOT_BINARY = "u-boot.img_HS" | 27 | UBOOT_BINARY = "u-boot.img_HS" |
11 | UBOOT_SYMLINK = "u-boot.img" | 28 | UBOOT_SYMLINK = "u-boot.img" |
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 96929286..80c0b890 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |||
@@ -36,7 +36,8 @@ SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs" | |||
36 | SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs" | 36 | SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs" |
37 | SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs" | 37 | SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs" |
38 | SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs" | 38 | SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs" |
39 | SYSFW_PREFIX_j784s4-evm-k3r5 = "fs" | 39 | SYSFW_PREFIX_j784s4-evm-k3r5-gp = "fs" |
40 | SYSFW_PREFIX_j784s4-evm-k3r5-sr1-hs-fs = "fs" | ||
40 | SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" | 41 | SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" |
41 | SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" | 42 | SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" |
42 | SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs" | 43 | SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs" |