* [meta-ti][dunfell][PATCH V4] conf: machine: j721s2-evm: Add support for J721S2 HS-FS
@ 2023-02-14 10:56 Sinthu Raja
2023-02-14 15:20 ` Ryan Eatmon
0 siblings, 1 reply; 3+ messages in thread
From: Sinthu Raja @ 2023-02-14 10:56 UTC (permalink / raw)
To: reatmon, denys, detheridge; +Cc: meta-ti, Sinthu Raja, Aniket Limaye
From: Sinthu Raja <sinthu.raja@ti.com>
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>
---
Change in V4:
============
- Remove evm conf file inclusion in hs-evm conf.
- Add j721s2 hs-evm specific config to hs-evm conf.
Change in V3:
============
Fix build issue.
Changes in V2:
=============
Address review comment:
- Keep GP as the default.
V1: https://lists.yoctoproject.org/g/meta-ti/message/15771
V2: https://lists.yoctoproject.org/g/meta-ti/message/15793
V3: https://lists.yoctoproject.org/g/meta-ti/message/15818
conf/machine/j721s2-evm-k3r5-gp.conf | 20 ++++++++++++++++++++
conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf | 15 +++++++++++++++
conf/machine/j721s2-evm.conf | 12 ++++++++++--
conf/machine/j721s2-hs-evm.conf | 18 +++++++++++++++++-
conf/multiconfig/k3r5-sr1-hs-fs.conf | 3 +++
conf/multiconfig/k3r5-sr1.conf | 3 +++
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
7 files changed, 70 insertions(+), 4 deletions(-)
create mode 100644 conf/machine/j721s2-evm-k3r5-gp.conf
create mode 100644 conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
create mode 100644 conf/multiconfig/k3r5-sr1-hs-fs.conf
create mode 100644 conf/multiconfig/k3r5-sr1.conf
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 @@
+#@TYPE: Machine
+#@NAME: J721S2 GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core)
+
+# Booting GP requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-gp"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+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 @@
+#@TYPE: Machine
+#@NAME: J721S2 HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-sr1-hs-fs"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
index 7c120dcc..7d2597b5 100644
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -40,5 +40,13 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+# Default tiboot3.bin on J721S2 is for GP
+BBMULTICONFIG = "k3r5-gp"
+do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
+BBMULTICONFIG += "k3r5-sr1-hs-fs"
+IMAGE_BOOT_FILES += " tiboot3-j721s2-hs-fs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
+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 @@
#@NAME: J721S2 HS EVM
#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
-require conf/machine/j721s2-evm.conf
+require conf/machine/include/j7.inc
+
+MACHINE_FEATURES += "gpu"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+TFA_K3_USART = "0x8"
+OPTEEMACHINE = "k3-j784s4"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE = " \
+ ti/k3-j721s2-common-proc-board.dtb \
+ ti/k3-j721s2-gesi-exp-board.dtbo \
+"
UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+
SPL_BINARY = "tispl.bin_HS"
UBOOT_BINARY = "u-boot.img_HS"
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 @@
+require k3r5-sr1.conf
+
+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 @@
+require k3r5.conf
+
+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 7896c366..cb197954 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"
SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs"
SYSFW_PREFIX_j7200-evm-k3r5 = "fs"
SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX_j721s2-evm-k3r5 = "fs"
+SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs"
+SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs"
SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs"
SYSFW_PREFIX_j784s4-evm-k3r5 = "fs"
SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs"
--
2.36.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-ti][dunfell][PATCH V4] conf: machine: j721s2-evm: Add support for J721S2 HS-FS
2023-02-14 10:56 [meta-ti][dunfell][PATCH V4] conf: machine: j721s2-evm: Add support for J721S2 HS-FS Sinthu Raja
@ 2023-02-14 15:20 ` Ryan Eatmon
2023-02-14 17:34 ` Sinthu Raja M
0 siblings, 1 reply; 3+ messages in thread
From: Ryan Eatmon @ 2023-02-14 15:20 UTC (permalink / raw)
To: Sinthu Raja, denys, detheridge; +Cc: meta-ti, Sinthu Raja, Aniket Limaye
Initial builds for both j721s2-evm and j721s2-hs-evm look good. Thank
you for being patient and getting this working.
On 2/14/2023 4:56, Sinthu Raja wrote:
> From: Sinthu Raja <sinthu.raja@ti.com>
>
> 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>
> ---
>
> Change in V4:
> ============
> - Remove evm conf file inclusion in hs-evm conf.
> - Add j721s2 hs-evm specific config to hs-evm conf.
>
> Change in V3:
> ============
> Fix build issue.
>
> Changes in V2:
> =============
> Address review comment:
> - Keep GP as the default.
>
> V1: https://lists.yoctoproject.org/g/meta-ti/message/15771
> V2: https://lists.yoctoproject.org/g/meta-ti/message/15793
> V3: https://lists.yoctoproject.org/g/meta-ti/message/15818
>
> conf/machine/j721s2-evm-k3r5-gp.conf | 20 ++++++++++++++++++++
> conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf | 15 +++++++++++++++
> conf/machine/j721s2-evm.conf | 12 ++++++++++--
> conf/machine/j721s2-hs-evm.conf | 18 +++++++++++++++++-
> conf/multiconfig/k3r5-sr1-hs-fs.conf | 3 +++
> conf/multiconfig/k3r5-sr1.conf | 3 +++
> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
> 7 files changed, 70 insertions(+), 4 deletions(-)
> create mode 100644 conf/machine/j721s2-evm-k3r5-gp.conf
> create mode 100644 conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
> create mode 100644 conf/multiconfig/k3r5-sr1-hs-fs.conf
> create mode 100644 conf/multiconfig/k3r5-sr1.conf
>
> 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 @@
> +#@TYPE: Machine
> +#@NAME: J721S2 GP EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core)
> +
> +# Booting GP requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append = ":k3r5-gp"
> +
> +SYSFW_SOC = "j721s2"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "gp"
> +SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
> +
> +UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
> +
> +SPL_BINARY = ""
> +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
> +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> +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 @@
> +#@TYPE: Machine
> +#@NAME: J721S2 HS-FS EVM (R5F)
> +#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core)
> +
> +# Booting HS-FS requires different SYSFW, the rest is handled at runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append = ":k3r5-sr1-hs-fs"
> +
> +SYSFW_SOC = "j721s2"
> +SYSFW_CONFIG = "evm"
> +SYSFW_SUFFIX = "hs-fs"
> +SYSFW_TIBOOT3_SYMLINK = ""
> +
> +UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
> diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
> index 7c120dcc..7d2597b5 100644
> --- a/conf/machine/j721s2-evm.conf
> +++ b/conf/machine/j721s2-evm.conf
> @@ -40,5 +40,13 @@ KERNEL_DEVICETREE = " \
>
> UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
>
> -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> +# Default tiboot3.bin on J721S2 is for GP
> +BBMULTICONFIG = "k3r5-gp"
> +do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
> +
> +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
> +BBMULTICONFIG += "k3r5-sr1-hs-fs"
> +IMAGE_BOOT_FILES += " tiboot3-j721s2-hs-fs-evm.bin"
> +do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
> +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 @@
> #@NAME: J721S2 HS EVM
> #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
>
> -require conf/machine/j721s2-evm.conf
> +require conf/machine/include/j7.inc
> +
> +MACHINE_FEATURES += "gpu"
> +
> +SERIAL_CONSOLES = "115200;ttyS2"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> +TFA_K3_USART = "0x8"
> +OPTEEMACHINE = "k3-j784s4"
> +OPTEE_K3_USART = "0x8"
> +
> +KERNEL_DEVICETREE = " \
> + ti/k3-j721s2-common-proc-board.dtb \
> + ti/k3-j721s2-gesi-exp-board.dtbo \
> +"
>
> UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
>
> +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> +
> SPL_BINARY = "tispl.bin_HS"
> UBOOT_BINARY = "u-boot.img_HS"
> 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 @@
> +require k3r5-sr1.conf
> +
> +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 @@
> +require k3r5.conf
> +
> +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 7896c366..cb197954 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"
> SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs"
> SYSFW_PREFIX_j7200-evm-k3r5 = "fs"
> SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs"
> -SYSFW_PREFIX_j721s2-evm-k3r5 = "fs"
> +SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs"
> +SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs"
> SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs"
> SYSFW_PREFIX_j784s4-evm-k3r5 = "fs"
> SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs"
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-ti][dunfell][PATCH V4] conf: machine: j721s2-evm: Add support for J721S2 HS-FS
2023-02-14 15:20 ` Ryan Eatmon
@ 2023-02-14 17:34 ` Sinthu Raja M
0 siblings, 0 replies; 3+ messages in thread
From: Sinthu Raja M @ 2023-02-14 17:34 UTC (permalink / raw)
To: Ryan Eatmon; +Cc: denys, detheridge, meta-ti, Sinthu Raja, Aniket Limaye
On Tue, Feb 14, 2023 at 8:50 PM Ryan Eatmon <reatmon@ti.com> wrote:
>
>
> Initial builds for both j721s2-evm and j721s2-hs-evm look good. Thank
> you for being patient and getting this working.
>
Thank you for your timely help.
>
> On 2/14/2023 4:56, Sinthu Raja wrote:
> > From: Sinthu Raja <sinthu.raja@ti.com>
> >
> > 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>
> > ---
> >
> > Change in V4:
> > ============
> > - Remove evm conf file inclusion in hs-evm conf.
> > - Add j721s2 hs-evm specific config to hs-evm conf.
> >
> > Change in V3:
> > ============
> > Fix build issue.
> >
> > Changes in V2:
> > =============
> > Address review comment:
> > - Keep GP as the default.
> >
> > V1: https://lists.yoctoproject.org/g/meta-ti/message/15771
> > V2: https://lists.yoctoproject.org/g/meta-ti/message/15793
> > V3: https://lists.yoctoproject.org/g/meta-ti/message/15818
> >
> > conf/machine/j721s2-evm-k3r5-gp.conf | 20 ++++++++++++++++++++
> > conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf | 15 +++++++++++++++
> > conf/machine/j721s2-evm.conf | 12 ++++++++++--
> > conf/machine/j721s2-hs-evm.conf | 18 +++++++++++++++++-
> > conf/multiconfig/k3r5-sr1-hs-fs.conf | 3 +++
> > conf/multiconfig/k3r5-sr1.conf | 3 +++
> > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
> > 7 files changed, 70 insertions(+), 4 deletions(-)
> > create mode 100644 conf/machine/j721s2-evm-k3r5-gp.conf
> > create mode 100644 conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
> > create mode 100644 conf/multiconfig/k3r5-sr1-hs-fs.conf
> > create mode 100644 conf/multiconfig/k3r5-sr1.conf
> >
> > 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 @@
> > +#@TYPE: Machine
> > +#@NAME: J721S2 GP EVM (R5F)
> > +#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core)
> > +
> > +# Booting GP requires different SYSFW, the rest is handled at runtime
> > +
> > +require conf/machine/include/k3r5.inc
> > +SOC_FAMILY_append = ":k3r5-gp"
> > +
> > +SYSFW_SOC = "j721s2"
> > +SYSFW_CONFIG = "evm"
> > +SYSFW_SUFFIX = "gp"
> > +SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
> > +
> > +UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
> > +
> > +SPL_BINARY = ""
> > +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
> > +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> > +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 @@
> > +#@TYPE: Machine
> > +#@NAME: J721S2 HS-FS EVM (R5F)
> > +#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core)
> > +
> > +# Booting HS-FS requires different SYSFW, the rest is handled at runtime
> > +
> > +require conf/machine/include/k3r5.inc
> > +SOC_FAMILY_append = ":k3r5-sr1-hs-fs"
> > +
> > +SYSFW_SOC = "j721s2"
> > +SYSFW_CONFIG = "evm"
> > +SYSFW_SUFFIX = "hs-fs"
> > +SYSFW_TIBOOT3_SYMLINK = ""
> > +
> > +UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
> > diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
> > index 7c120dcc..7d2597b5 100644
> > --- a/conf/machine/j721s2-evm.conf
> > +++ b/conf/machine/j721s2-evm.conf
> > @@ -40,5 +40,13 @@ KERNEL_DEVICETREE = " \
> >
> > UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
> >
> > -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> > -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> > +# Default tiboot3.bin on J721S2 is for GP
> > +BBMULTICONFIG = "k3r5-gp"
> > +do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
> > +do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
> > +
> > +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
> > +BBMULTICONFIG += "k3r5-sr1-hs-fs"
> > +IMAGE_BOOT_FILES += " tiboot3-j721s2-hs-fs-evm.bin"
> > +do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
> > +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 @@
> > #@NAME: J721S2 HS EVM
> > #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
> >
> > -require conf/machine/j721s2-evm.conf
> > +require conf/machine/include/j7.inc
> > +
> > +MACHINE_FEATURES += "gpu"
> > +
> > +SERIAL_CONSOLES = "115200;ttyS2"
> > +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> > +TFA_K3_USART = "0x8"
> > +OPTEEMACHINE = "k3-j784s4"
> > +OPTEE_K3_USART = "0x8"
> > +
> > +KERNEL_DEVICETREE = " \
> > + ti/k3-j721s2-common-proc-board.dtb \
> > + ti/k3-j721s2-gesi-exp-board.dtbo \
> > +"
> >
> > UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
> >
> > +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> > +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> > +
> > SPL_BINARY = "tispl.bin_HS"
> > UBOOT_BINARY = "u-boot.img_HS"
> > 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 @@
> > +require k3r5-sr1.conf
> > +
> > +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 @@
> > +require k3r5.conf
> > +
> > +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 7896c366..cb197954 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"
> > SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs"
> > SYSFW_PREFIX_j7200-evm-k3r5 = "fs"
> > SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs"
> > -SYSFW_PREFIX_j721s2-evm-k3r5 = "fs"
> > +SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs"
> > +SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs"
> > SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs"
> > SYSFW_PREFIX_j784s4-evm-k3r5 = "fs"
> > SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs"
>
> --
> Ryan Eatmon reatmon@ti.com
> -----------------------------------------
> Texas Instruments, Inc. - LCPD - MGTS
--
With Regards
Sinthu Raja
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-14 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-14 10:56 [meta-ti][dunfell][PATCH V4] conf: machine: j721s2-evm: Add support for J721S2 HS-FS Sinthu Raja
2023-02-14 15:20 ` Ryan Eatmon
2023-02-14 17:34 ` Sinthu Raja M
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.