diff options
author | Sinthu Raja <sinthu.raja@ti.com> | 2023-02-14 16:26:42 +0530 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-02-14 07:42:25 -0600 |
commit | 937b57b6d63a4267b96f25ec15c2809f7f288f76 (patch) | |
tree | b728fd7f7af0d864a4ad14d87731e6d6efa08e73 | |
parent | 0853939164dba2484c5e327b144e8215b8835cd5 (diff) | |
download | meta-ti-937b57b6d63a4267b96f25ec15c2809f7f288f76.tar.gz |
conf: machine: j721s2-evm: Add support for J721S2 HS-FS
Add the basic J721S2 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 j721s2 hs-evm specific config to hs-evm conf.
Signed-off-by: Aniket Limaye <a-limaye@ti.com>
Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | conf/machine/j721s2-evm-k3r5-gp.conf | 20 | ||||
-rw-r--r-- | conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf | 15 | ||||
-rw-r--r-- | conf/machine/j721s2-evm.conf | 12 | ||||
-rw-r--r-- | conf/machine/j721s2-hs-evm.conf | 18 | ||||
-rw-r--r-- | conf/multiconfig/k3r5-sr1-hs-fs.conf | 3 | ||||
-rw-r--r-- | conf/multiconfig/k3r5-sr1.conf | 3 | ||||
-rw-r--r-- | recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 |
7 files changed, 70 insertions, 4 deletions
diff --git a/conf/machine/j721s2-evm-k3r5-gp.conf b/conf/machine/j721s2-evm-k3r5-gp.conf new file mode 100644 index 00000000..06456ef7 --- /dev/null +++ b/conf/machine/j721s2-evm-k3r5-gp.conf | |||
@@ -0,0 +1,20 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: J721S2 GP EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI J721S2 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 = "j721s2" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "gp" | ||
13 | SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" | ||
14 | |||
15 | UBOOT_MACHINE = "j721s2_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/j721s2-evm-k3r5-sr1-hs-fs.conf b/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf new file mode 100644 index 00000000..786338a9 --- /dev/null +++ b/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf | |||
@@ -0,0 +1,15 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: J721S2 HS-FS EVM (R5F) | ||
3 | #@DESCRIPTION: Machine configuration for the TI J721S2 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 = "j721s2" | ||
11 | SYSFW_CONFIG = "evm" | ||
12 | SYSFW_SUFFIX = "hs-fs" | ||
13 | SYSFW_TIBOOT3_SYMLINK = "" | ||
14 | |||
15 | UBOOT_MACHINE = "j721s2_evm_r5_defconfig" | ||
diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf index f1127ed5..35b5a4ab 100644 --- a/conf/machine/j721s2-evm.conf +++ b/conf/machine/j721s2-evm.conf | |||
@@ -41,5 +41,13 @@ KERNEL_DEVICETREE = " \ | |||
41 | 41 | ||
42 | UBOOT_MACHINE = "j721s2_evm_a72_defconfig" | 42 | UBOOT_MACHINE = "j721s2_evm_a72_defconfig" |
43 | 43 | ||
44 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 44 | # Default tiboot3.bin on J721S2 is for GP |
45 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | 45 | BBMULTICONFIG = "k3r5-gp" |
46 | do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
47 | do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" | ||
48 | |||
49 | # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS | ||
50 | BBMULTICONFIG += "k3r5-sr1-hs-fs" | ||
51 | IMAGE_BOOT_FILES += " tiboot3-j721s2-hs-fs-evm.bin" | ||
52 | do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" | ||
53 | do_image_tar[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" | ||
diff --git a/conf/machine/j721s2-hs-evm.conf b/conf/machine/j721s2-hs-evm.conf index 3d737f44..2895787b 100644 --- a/conf/machine/j721s2-hs-evm.conf +++ b/conf/machine/j721s2-hs-evm.conf | |||
@@ -2,10 +2,26 @@ | |||
2 | #@NAME: J721S2 HS EVM | 2 | #@NAME: J721S2 HS EVM |
3 | #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM | 3 | #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM |
4 | 4 | ||
5 | require conf/machine/j721s2-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-j721s2-common-proc-board.dtb \ | ||
17 | ti/k3-j721s2-gesi-exp-board.dtbo \ | ||
18 | " | ||
6 | 19 | ||
7 | UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" | 20 | UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" |
8 | 21 | ||
22 | do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | ||
23 | do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" | ||
24 | |||
9 | SPL_BINARY = "tispl.bin_HS" | 25 | SPL_BINARY = "tispl.bin_HS" |
10 | UBOOT_BINARY = "u-boot.img_HS" | 26 | UBOOT_BINARY = "u-boot.img_HS" |
11 | UBOOT_SYMLINK = "u-boot.img" | 27 | UBOOT_SYMLINK = "u-boot.img" |
diff --git a/conf/multiconfig/k3r5-sr1-hs-fs.conf b/conf/multiconfig/k3r5-sr1-hs-fs.conf new file mode 100644 index 00000000..2fa28c95 --- /dev/null +++ b/conf/multiconfig/k3r5-sr1-hs-fs.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | require k3r5-sr1.conf | ||
2 | |||
3 | MACHINE_append = "-hs-fs" | ||
diff --git a/conf/multiconfig/k3r5-sr1.conf b/conf/multiconfig/k3r5-sr1.conf new file mode 100644 index 00000000..2b87de8a --- /dev/null +++ b/conf/multiconfig/k3r5-sr1.conf | |||
@@ -0,0 +1,3 @@ | |||
1 | require k3r5.conf | ||
2 | |||
3 | MACHINE_append = "-sr1" | ||
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 4a7b9e63..e3ffef37 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |||
@@ -33,7 +33,8 @@ SYSFW_PREFIX_j7-hs-evm-k3r5 = "fs" | |||
33 | SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs" | 33 | SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs" |
34 | SYSFW_PREFIX_j7200-evm-k3r5 = "fs" | 34 | SYSFW_PREFIX_j7200-evm-k3r5 = "fs" |
35 | SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs" | 35 | SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs" |
36 | SYSFW_PREFIX_j721s2-evm-k3r5 = "fs" | 36 | SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs" |
37 | SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs" | ||
37 | SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs" | 38 | SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs" |
38 | SYSFW_PREFIX_j784s4-evm-k3r5 = "fs" | 39 | SYSFW_PREFIX_j784s4-evm-k3r5 = "fs" |
39 | SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" | 40 | SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" |