| Message ID | 20230123102459.562886-1-c-shilwant@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,dunfell] conf: machine: am62xx-evm: Add Support for AM62xx HS-SE | expand |
On 1/23/23 4:24 AM, Chirag Shilwant via lists.yoctoproject.org wrote: > - Add machine conf for AM62xx HS-SE. > - The wic images will boot on AM62x GP devices by default. To boot on AM62x HS-SE, simply switch out the SYSFW image: > /me longs for day when HS is first-class and GP is treated like the degenerate case it is.. Reviewed-by: Andrew Davis <afd@ti.com> > $ cd /mnt/sd-card/boot > $ mv tiboot3-am62x-hs-evm.bin tiboot3.bin > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > --- > ...-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} | 3 +++ > conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 +++++++++++++++++++ > conf/machine/am62xx-evm.conf | 4 ++++ > conf/machine/include/am62xx.inc | 11 ++++++++-- > 4 files changed, 37 insertions(+), 2 deletions(-) > rename conf/machine/{am62xx-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} (67%) > create mode 100644 conf/machine/am62xx-evm-k3r5-hs-se.conf > > diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5-gp.conf > similarity index 67% > rename from conf/machine/am62xx-evm-k3r5.conf > rename to conf/machine/am62xx-evm-k3r5-gp.conf > index 724a8d4a..d9867bc7 100644 > --- a/conf/machine/am62xx-evm-k3r5.conf > +++ b/conf/machine/am62xx-evm-k3r5-gp.conf > @@ -9,3 +9,6 @@ SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "gp" > > UBOOT_MACHINE = "am62x_evm_r5_defconfig" > + > +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" > +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" > diff --git a/conf/machine/am62xx-evm-k3r5-hs-se.conf b/conf/machine/am62xx-evm-k3r5-hs-se.conf > new file mode 100644 > index 00000000..913e69fa > --- /dev/null > +++ b/conf/machine/am62xx-evm-k3r5-hs-se.conf > @@ -0,0 +1,21 @@ > +#@TYPE: Machine > +#@NAME: AM62xx HS-SE EVM (R5F) > +#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F core) > + > +# Booting HS-SE requires different SYSFW, the rest is handled at runtime > + > +require conf/machine/include/k3r5.inc > +SOC_FAMILY_append = ":k3r5-hs-se" > + > +SYSFW_SOC = "am62x" > +SYSFW_CONFIG = "evm" > +SYSFW_SUFFIX = "hs" > + > +SYSFW_TIBOOT3_SYMLINK = "" > + > +UBOOT_MACHINE = "am62x_evm_r5_defconfig" > + > +SPL_BINARY = "" > +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" > +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" > +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" > diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf > index 3d9e3b90..b4904eca 100644 > --- a/conf/machine/am62xx-evm.conf > +++ b/conf/machine/am62xx-evm.conf > @@ -19,3 +19,7 @@ KERNEL_DEVICETREE = " \ > " > > UBOOT_MACHINE = "am62x_evm_a53_defconfig" > + > +SPL_BINARY = "tispl.bin_HS" > +UBOOT_BINARY = "u-boot.img_HS" > +UBOOT_SYMLINK = "u-boot.img" > diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc > index 0231235f..912318e9 100644 > --- a/conf/machine/include/am62xx.inc > +++ b/conf/machine/include/am62xx.inc > @@ -8,8 +8,15 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" > > TFA_K3_SYSTEM_SUSPEND = "1" > > -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > +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 AM62x is for GP, add a version for HS-SE > +BBMULTICONFIG += "k3r5-hs-se" > +IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin" > +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" > +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" > > TFA_BOARD = "lite" > OPTEEMACHINE = "k3-am62x" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#15619): https://lists.yoctoproject.org/g/meta-ti/message/15619 > Mute This Topic: https://lists.yoctoproject.org/mt/96470962/3619733 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 1/23/2023 9:43 AM, Andrew Davis wrote: > On 1/23/23 4:24 AM, Chirag Shilwant via lists.yoctoproject.org wrote: >> - Add machine conf for AM62xx HS-SE. >> - The wic images will boot on AM62x GP devices by default. To boot on >> AM62x HS-SE, simply switch out the SYSFW image: >> > > /me longs for day when HS is first-class and GP is treated like the > degenerate case it is.. Thanks for reviewing. Unfortunately AM62x is not there yet, GP is still in the hands of customers and expectation of default is needed on dunfell. Kirkstone/mainline is a good target to switch default to HS. > > Reviewed-by: Andrew Davis <afd@ti.com> > >> $ cd /mnt/sd-card/boot >> $ mv tiboot3-am62x-hs-evm.bin tiboot3.bin >> >> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> >> --- >> ...-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} | 3 +++ >> conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 +++++++++++++++++++ >> conf/machine/am62xx-evm.conf | 4 ++++ >> conf/machine/include/am62xx.inc | 11 ++++++++-- >> 4 files changed, 37 insertions(+), 2 deletions(-) >> rename conf/machine/{am62xx-evm-k3r5.conf => >> am62xx-evm-k3r5-gp.conf} (67%) >> create mode 100644 conf/machine/am62xx-evm-k3r5-hs-se.conf >> >> diff --git a/conf/machine/am62xx-evm-k3r5.conf >> b/conf/machine/am62xx-evm-k3r5-gp.conf >> similarity index 67% >> rename from conf/machine/am62xx-evm-k3r5.conf >> rename to conf/machine/am62xx-evm-k3r5-gp.conf >> index 724a8d4a..d9867bc7 100644 >> --- a/conf/machine/am62xx-evm-k3r5.conf >> +++ b/conf/machine/am62xx-evm-k3r5-gp.conf >> @@ -9,3 +9,6 @@ SYSFW_CONFIG = "evm" >> SYSFW_SUFFIX = "gp" >> UBOOT_MACHINE = "am62x_evm_r5_defconfig" >> + >> +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" >> +UBOOT_IMAGE = >> "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" >> diff --git a/conf/machine/am62xx-evm-k3r5-hs-se.conf >> b/conf/machine/am62xx-evm-k3r5-hs-se.conf >> new file mode 100644 >> index 00000000..913e69fa >> --- /dev/null >> +++ b/conf/machine/am62xx-evm-k3r5-hs-se.conf >> @@ -0,0 +1,21 @@ >> +#@TYPE: Machine >> +#@NAME: AM62xx HS-SE EVM (R5F) >> +#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F >> core) >> + >> +# Booting HS-SE requires different SYSFW, the rest is handled at runtime >> + >> +require conf/machine/include/k3r5.inc >> +SOC_FAMILY_append = ":k3r5-hs-se" >> + >> +SYSFW_SOC = "am62x" >> +SYSFW_CONFIG = "evm" >> +SYSFW_SUFFIX = "hs" >> + >> +SYSFW_TIBOOT3_SYMLINK = "" >> + >> +UBOOT_MACHINE = "am62x_evm_r5_defconfig" >> + >> +SPL_BINARY = "" >> +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" >> +UBOOT_IMAGE = >> "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" >> +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" >> diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf >> index 3d9e3b90..b4904eca 100644 >> --- a/conf/machine/am62xx-evm.conf >> +++ b/conf/machine/am62xx-evm.conf >> @@ -19,3 +19,7 @@ KERNEL_DEVICETREE = " \ >> " >> UBOOT_MACHINE = "am62x_evm_a53_defconfig" >> + >> +SPL_BINARY = "tispl.bin_HS" >> +UBOOT_BINARY = "u-boot.img_HS" >> +UBOOT_SYMLINK = "u-boot.img" >> diff --git a/conf/machine/include/am62xx.inc >> b/conf/machine/include/am62xx.inc >> index 0231235f..912318e9 100644 >> --- a/conf/machine/include/am62xx.inc >> +++ b/conf/machine/include/am62xx.inc >> @@ -8,8 +8,15 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" >> TFA_K3_SYSTEM_SUSPEND = "1" >> -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> +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 AM62x is for GP, add a version for HS-SE >> +BBMULTICONFIG += "k3r5-hs-se" >> +IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin" >> +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" >> +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" >> TFA_BOARD = "lite" >> OPTEEMACHINE = "k3-am62x" >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#15619): >> https://lists.yoctoproject.org/g/meta-ti/message/15619 >> Mute This Topic: https://lists.yoctoproject.org/mt/96470962/3619733 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5-gp.conf similarity index 67% rename from conf/machine/am62xx-evm-k3r5.conf rename to conf/machine/am62xx-evm-k3r5-gp.conf index 724a8d4a..d9867bc7 100644 --- a/conf/machine/am62xx-evm-k3r5.conf +++ b/conf/machine/am62xx-evm-k3r5-gp.conf @@ -9,3 +9,6 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62xx-evm-k3r5-hs-se.conf b/conf/machine/am62xx-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..913e69fa --- /dev/null +++ b/conf/machine/am62xx-evm-k3r5-hs-se.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: AM62xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf index 3d9e3b90..b4904eca 100644 --- a/conf/machine/am62xx-evm.conf +++ b/conf/machine/am62xx-evm.conf @@ -19,3 +19,7 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "am62x_evm_a53_defconfig" + +SPL_BINARY = "tispl.bin_HS" +UBOOT_BINARY = "u-boot.img_HS" +UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc index 0231235f..912318e9 100644 --- a/conf/machine/include/am62xx.inc +++ b/conf/machine/include/am62xx.inc @@ -8,8 +8,15 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_SYSTEM_SUSPEND = "1" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +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 AM62x is for GP, add a version for HS-SE +BBMULTICONFIG += "k3r5-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x"
- Add machine conf for AM62xx HS-SE. - The wic images will boot on AM62x GP devices by default. To boot on AM62x HS-SE, simply switch out the SYSFW image: $ cd /mnt/sd-card/boot $ mv tiboot3-am62x-hs-evm.bin tiboot3.bin Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> --- ...-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} | 3 +++ conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 +++++++++++++++++++ conf/machine/am62xx-evm.conf | 4 ++++ conf/machine/include/am62xx.inc | 11 ++++++++-- 4 files changed, 37 insertions(+), 2 deletions(-) rename conf/machine/{am62xx-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} (67%) create mode 100644 conf/machine/am62xx-evm-k3r5-hs-se.conf