| Message ID | 20230214154939.340754-1-sabiya.d@ti.com |
|---|---|
| State | RFC |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [dunfell,RFC,PATCH-V2] conf: machine: j784s4-evm: Add support for J784S4 HS-FS | expand |
On 2/14/2023 9:49, sabiya.d@mistralsolutions.com wrote: > From: Dasnavis <sabiya.d@ti.com> > > 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: Dasnavis <sabiya.d@ti.com> > --- > conf/machine/j784s4-evm-k3r5-gp.conf | 21 +++++++++++++++++++++ > conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf | 15 +++++++++++++++ > conf/machine/j784s4-evm-k3r5.conf | 1 + > conf/machine/j784s4-evm.conf | 13 ++++++++++--- > conf/machine/j784s4-hs-evm-k3r5.conf | 1 + > conf/machine/j784s4-hs-evm.conf | 19 ++++++++++++++++++- > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++- > 7 files changed, 68 insertions(+), 5 deletions(-) > create mode 100644 conf/machine/j784s4-evm-k3r5-gp.conf > create mode 100644 conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf > > diff --git a/conf/machine/j784s4-evm-k3r5-gp.conf b/conf/machine/j784s4-evm-k3r5-gp.conf > new file mode 100644 > index 00000000..b8693655 > --- /dev/null > +++ b/conf/machine/j784s4-evm-k3r5-gp.conf > @@ -0,0 +1,21 @@ > +#@TYPE: Machine > +#@NAME: J784S4 GP EVM (R5F) > +#@DESCRIPTION: Machine configuration for the TI J784S4 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 = "j784s4" > +SYSFW_CONFIG = "evm" > +SYSFW_SUFFIX = "gp" > +SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" > +SYSFW_SYMLINK = "" You do not need the SYSFW_SIMLINK = "" here. The rule basically is, if you have SYSFW_TIBOOT3_SYMLINK = "", then you also need SYSFW_SIMLINK = "". > + > +UBOOT_MACHINE = "j784s4_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/j784s4-evm-k3r5-sr1-hs-fs.conf b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf > new file mode 100644 > index 00000000..8c77c910 > --- /dev/null > +++ b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf > @@ -0,0 +1,15 @@ > +#@TYPE: Machine > +#@NAME: J784S4 HS-FS EVM (R5F) > +#@DESCRIPTION: Machine configuration for the TI J784S4 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 = "j784s4" > +SYSFW_CONFIG = "evm" > +SYSFW_SUFFIX = "hs-fs" > +SYSFW_TIBOOT3_SYMLINK = "" You do need it here.... > + > +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" > diff --git a/conf/machine/j784s4-evm-k3r5.conf b/conf/machine/j784s4-evm-k3r5.conf > index 04feebc6..3f010797 100644 > --- a/conf/machine/j784s4-evm-k3r5.conf > +++ b/conf/machine/j784s4-evm-k3r5.conf > @@ -7,5 +7,6 @@ require conf/machine/include/k3r5.inc > SYSFW_SOC = "j784s4" > SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "gp" > +SYSFW_SYMLINK = "" You do not need it here... > 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 = " \ > > UBOOT_MACHINE = "j784s4_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 J784S4 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" > > -TFA_BOARD = "j784s4" > +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS > +BBMULTICONFIG += "k3r5-sr1-hs-fs" > +IMAGE_BOOT_FILES += " tiboot3-j784s4-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" > > +TFA_BOARD = "j784s4" > diff --git a/conf/machine/j784s4-hs-evm-k3r5.conf b/conf/machine/j784s4-hs-evm-k3r5.conf > index 80a228a0..0f5e69e4 100644 > --- a/conf/machine/j784s4-hs-evm-k3r5.conf > +++ b/conf/machine/j784s4-hs-evm-k3r5.conf > @@ -7,5 +7,6 @@ require conf/machine/include/k3r5.inc > SYSFW_SOC = "j784s4" > SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "hs" > +SYSFW_SYMLINK = "" You do not need it here either. > UBOOT_MACHINE = "j784s4_evm_r5_defconfig" > 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 @@ > #@NAME: J784S4 HS EVM > #@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM > > -require conf/machine/j784s4-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-j784s4-evm.dtb \ > +" > > UBOOT_MACHINE = "j784s4_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" > + > +TFA_BOARD = "j784s4" > + > SPL_BINARY = "tispl.bin_HS" > UBOOT_BINARY = "u-boot.img_HS" > 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 c5fff3f7..cafb24e6 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" > 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-evm-k3r5-gp = "fs" > +SYSFW_PREFIX_j784s4-evm-k3r5-sr1-hs-fs = "fs" > SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" > SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" > SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs"
On 2/14/2023 14:41, Ryan Eatmon via lists.yoctoproject.org wrote: > > > On 2/14/2023 9:49, sabiya.d@mistralsolutions.com wrote: >> From: Dasnavis <sabiya.d@ti.com> >> >> 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: Dasnavis <sabiya.d@ti.com> >> --- >> conf/machine/j784s4-evm-k3r5-gp.conf | 21 +++++++++++++++++++++ >> conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf | 15 +++++++++++++++ >> conf/machine/j784s4-evm-k3r5.conf | 1 + >> conf/machine/j784s4-evm.conf | 13 ++++++++++--- >> conf/machine/j784s4-hs-evm-k3r5.conf | 1 + >> conf/machine/j784s4-hs-evm.conf | 19 ++++++++++++++++++- >> recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++- >> 7 files changed, 68 insertions(+), 5 deletions(-) >> create mode 100644 conf/machine/j784s4-evm-k3r5-gp.conf >> create mode 100644 conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf >> >> diff --git a/conf/machine/j784s4-evm-k3r5-gp.conf >> b/conf/machine/j784s4-evm-k3r5-gp.conf >> new file mode 100644 >> index 00000000..b8693655 >> --- /dev/null >> +++ b/conf/machine/j784s4-evm-k3r5-gp.conf >> @@ -0,0 +1,21 @@ >> +#@TYPE: Machine >> +#@NAME: J784S4 GP EVM (R5F) >> +#@DESCRIPTION: Machine configuration for the TI J784S4 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 = "j784s4" >> +SYSFW_CONFIG = "evm" >> +SYSFW_SUFFIX = "gp" >> +SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" >> +SYSFW_SYMLINK = "" > > You do not need the SYSFW_SIMLINK = "" here. > > > The rule basically is, if you have SYSFW_TIBOOT3_SYMLINK = "", then you > also need SYSFW_SIMLINK = "". And I can't spell... SYMLINK, not SIMLINK.... > >> + >> +UBOOT_MACHINE = "j784s4_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/j784s4-evm-k3r5-sr1-hs-fs.conf >> b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf >> new file mode 100644 >> index 00000000..8c77c910 >> --- /dev/null >> +++ b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf >> @@ -0,0 +1,15 @@ >> +#@TYPE: Machine >> +#@NAME: J784S4 HS-FS EVM (R5F) >> +#@DESCRIPTION: Machine configuration for the TI J784S4 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 = "j784s4" >> +SYSFW_CONFIG = "evm" >> +SYSFW_SUFFIX = "hs-fs" >> +SYSFW_TIBOOT3_SYMLINK = "" > > You do need it here.... > >> + >> +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" >> diff --git a/conf/machine/j784s4-evm-k3r5.conf >> b/conf/machine/j784s4-evm-k3r5.conf >> index 04feebc6..3f010797 100644 >> --- a/conf/machine/j784s4-evm-k3r5.conf >> +++ b/conf/machine/j784s4-evm-k3r5.conf >> @@ -7,5 +7,6 @@ require conf/machine/include/k3r5.inc >> SYSFW_SOC = "j784s4" >> SYSFW_CONFIG = "evm" >> SYSFW_SUFFIX = "gp" >> +SYSFW_SYMLINK = "" > > You do not need it here... > > >> 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 = " \ >> UBOOT_MACHINE = "j784s4_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 J784S4 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" >> -TFA_BOARD = "j784s4" >> +# Since default tiboot3.bin on J784S4 is for GP, add a version for >> SR1.0 HS-FS >> +BBMULTICONFIG += "k3r5-sr1-hs-fs" >> +IMAGE_BOOT_FILES += " tiboot3-j784s4-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" >> +TFA_BOARD = "j784s4" >> diff --git a/conf/machine/j784s4-hs-evm-k3r5.conf >> b/conf/machine/j784s4-hs-evm-k3r5.conf >> index 80a228a0..0f5e69e4 100644 >> --- a/conf/machine/j784s4-hs-evm-k3r5.conf >> +++ b/conf/machine/j784s4-hs-evm-k3r5.conf >> @@ -7,5 +7,6 @@ require conf/machine/include/k3r5.inc >> SYSFW_SOC = "j784s4" >> SYSFW_CONFIG = "evm" >> SYSFW_SUFFIX = "hs" >> +SYSFW_SYMLINK = "" > > You do not need it here either. > > >> UBOOT_MACHINE = "j784s4_evm_r5_defconfig" >> 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 @@ >> #@NAME: J784S4 HS EVM >> #@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM >> -require conf/machine/j784s4-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-j784s4-evm.dtb \ >> +" >> UBOOT_MACHINE = "j784s4_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" >> + >> +TFA_BOARD = "j784s4" >> + >> SPL_BINARY = "tispl.bin_HS" >> UBOOT_BINARY = "u-boot.img_HS" >> 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 c5fff3f7..cafb24e6 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" >> 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-evm-k3r5-gp = "fs" >> +SYSFW_PREFIX_j784s4-evm-k3r5-sr1-hs-fs = "fs" >> SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" >> SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" >> SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#15843): https://lists.yoctoproject.org/g/meta-ti/message/15843 > Mute This Topic: https://lists.yoctoproject.org/mt/96962550/6551054 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/10828724/6551054/1815494134/xyzzy [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/conf/machine/j784s4-evm-k3r5-gp.conf b/conf/machine/j784s4-evm-k3r5-gp.conf new file mode 100644 index 00000000..b8693655 --- /dev/null +++ b/conf/machine/j784s4-evm-k3r5-gp.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: J784S4 GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 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 = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" +SYSFW_SYMLINK = "" + +UBOOT_MACHINE = "j784s4_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/j784s4-evm-k3r5-sr1-hs-fs.conf b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf new file mode 100644 index 00000000..8c77c910 --- /dev/null +++ b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf @@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: J784S4 HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 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 = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/conf/machine/j784s4-evm-k3r5.conf b/conf/machine/j784s4-evm-k3r5.conf index 04feebc6..3f010797 100644 --- a/conf/machine/j784s4-evm-k3r5.conf +++ b/conf/machine/j784s4-evm-k3r5.conf @@ -7,5 +7,6 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "j784s4" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" +SYSFW_SYMLINK = "" 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 = " \ UBOOT_MACHINE = "j784s4_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 J784S4 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" -TFA_BOARD = "j784s4" +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS +BBMULTICONFIG += "k3r5-sr1-hs-fs" +IMAGE_BOOT_FILES += " tiboot3-j784s4-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" +TFA_BOARD = "j784s4" diff --git a/conf/machine/j784s4-hs-evm-k3r5.conf b/conf/machine/j784s4-hs-evm-k3r5.conf index 80a228a0..0f5e69e4 100644 --- a/conf/machine/j784s4-hs-evm-k3r5.conf +++ b/conf/machine/j784s4-hs-evm-k3r5.conf @@ -7,5 +7,6 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "j784s4" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" +SYSFW_SYMLINK = "" UBOOT_MACHINE = "j784s4_evm_r5_defconfig" 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 @@ #@NAME: J784S4 HS EVM #@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM -require conf/machine/j784s4-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-j784s4-evm.dtb \ +" UBOOT_MACHINE = "j784s4_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" + +TFA_BOARD = "j784s4" + SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" 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 c5fff3f7..cafb24e6 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" 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-evm-k3r5-gp = "fs" +SYSFW_PREFIX_j784s4-evm-k3r5-sr1-hs-fs = "fs" SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs"