* [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration @ 2023-02-10 12:56 Chirag Shilwant 2023-02-10 20:15 ` Denys Dmytriyenko 0 siblings, 1 reply; 3+ messages in thread From: Chirag Shilwant @ 2023-02-10 12:56 UTC (permalink / raw) To: Praneeth Bajjuri, Denys Dmytriyenko, Ryan Eatmon, meta-ti Cc: Sai Sree Kartheek Adivi, Paresh Bhagat, Gyan Gupta Lets add the basic AM62x LP HS-FS configuration - Add machine conf for AM62x LP HS-FS. - The wic images will boot on AM62x LP HS-FS devices by default. The sysfw image for HS-SE will be packaged in the wic image as tiboot3-am62x-hs-evm.bin. - Add ti-sci-firmware overrides. Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> --- conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf | 14 ++++++++++++++ conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 7 +++++++ conf/machine/include/am62xx-lp.inc | 8 +++++++- conf/multiconfig/k3r5-hs-fs.conf | 3 +++ recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf create mode 100644 conf/multiconfig/k3r5-hs-fs.conf diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..0178fcfc --- /dev/null +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM62xx LPSK HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP 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-hs-fs" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf index b752ee7e..37e9760a 100644 --- a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf @@ -11,4 +11,11 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" +SYSFW_TIBOOT3_SYMLINK = "" + UBOOT_MACHINE = "am62x_lpsk_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/include/am62xx-lp.inc b/conf/machine/include/am62xx-lp.inc index c38de868..02937662 100644 --- a/conf/machine/include/am62xx-lp.inc +++ b/conf/machine/include/am62xx-lp.inc @@ -8,8 +8,14 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_SYSTEM_SUSPEND = "1" -# Default tiboot3.bin on AM62x LP is for HS-SE +# Default tiboot3.bin on AM62x LP is for HS-FS +BBMULTICONFIG = "k3r5-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62x LP is for HS-FS, 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" diff --git a/conf/multiconfig/k3r5-hs-fs.conf b/conf/multiconfig/k3r5-hs-fs.conf new file mode 100644 index 00000000..c6d58ead --- /dev/null +++ b/conf/multiconfig/k3r5-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-hs-fs" 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..24af66a2 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -41,6 +41,7 @@ SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs" SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs" SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs" SYSFW_PREFIX_am62axx-evm-k3r5 = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" -- 2.34.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration 2023-02-10 12:56 [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration Chirag Shilwant @ 2023-02-10 20:15 ` Denys Dmytriyenko 2023-02-13 14:19 ` [EXTERNAL] " Shilwant, Chirag 0 siblings, 1 reply; 3+ messages in thread From: Denys Dmytriyenko @ 2023-02-10 20:15 UTC (permalink / raw) To: Chirag Shilwant Cc: Praneeth Bajjuri, Ryan Eatmon, meta-ti, Sai Sree Kartheek Adivi, Paresh Bhagat, Gyan Gupta I see all 3 patches are trying to add the same new multiconfig file: > create mode 100644 conf/multiconfig/k3r5-hs-fs.conf AM62A: https://patchwork.yoctoproject.org/project/ti/patch/20230210000834.24783-1-s-adivi@ti.com/ AM62: https://patchwork.yoctoproject.org/project/ti/patch/20230210124534.2607360-1-c-shilwant@ti.com/ AM62 LP: https://patchwork.yoctoproject.org/project/ti/patch/20230210124534.2607360-1-c-shilwant@ti.com/ This would cause a conflict and extra work for maintainer... On Fri, Feb 10, 2023 at 06:26:15PM +0530, Chirag Shilwant wrote: > Lets add the basic AM62x LP HS-FS configuration > - Add machine conf for AM62x LP HS-FS. > - The wic images will boot on AM62x LP HS-FS devices by default. The sysfw image for HS-SE will be packaged in the wic image as tiboot3-am62x-hs-evm.bin. > - Add ti-sci-firmware overrides. > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > --- > conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf | 14 ++++++++++++++ > conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 7 +++++++ > conf/machine/include/am62xx-lp.inc | 8 +++++++- > conf/multiconfig/k3r5-hs-fs.conf | 3 +++ > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + > 5 files changed, 32 insertions(+), 1 deletion(-) > create mode 100644 conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf > create mode 100644 conf/multiconfig/k3r5-hs-fs.conf > > diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf > new file mode 100644 > index 00000000..0178fcfc > --- /dev/null > +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf > @@ -0,0 +1,14 @@ > +#@TYPE: Machine > +#@NAME: AM62xx LPSK HS-FS EVM (R5F) > +#@DESCRIPTION: Machine configuration for the TI AM62xx LP 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-hs-fs" > + > +SYSFW_SOC = "am62x" > +SYSFW_CONFIG = "evm" > +SYSFW_SUFFIX = "hs-fs" > + > +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf > index b752ee7e..37e9760a 100644 > --- a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf > +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf > @@ -11,4 +11,11 @@ SYSFW_SOC = "am62x" > SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "hs" > > +SYSFW_TIBOOT3_SYMLINK = "" > + > UBOOT_MACHINE = "am62x_lpsk_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/include/am62xx-lp.inc b/conf/machine/include/am62xx-lp.inc > index c38de868..02937662 100644 > --- a/conf/machine/include/am62xx-lp.inc > +++ b/conf/machine/include/am62xx-lp.inc > @@ -8,8 +8,14 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" > > TFA_K3_SYSTEM_SUSPEND = "1" > > -# Default tiboot3.bin on AM62x LP is for HS-SE > +# Default tiboot3.bin on AM62x LP is for HS-FS > +BBMULTICONFIG = "k3r5-hs-fs" > +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" > +do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" > + > +# Since default tiboot3.bin on AM62x LP is for HS-FS, 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" > > diff --git a/conf/multiconfig/k3r5-hs-fs.conf b/conf/multiconfig/k3r5-hs-fs.conf > new file mode 100644 > index 00000000..c6d58ead > --- /dev/null > +++ b/conf/multiconfig/k3r5-hs-fs.conf > @@ -0,0 +1,3 @@ > +require k3r5.conf > + > +MACHINE_append = "-hs-fs" > 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..24af66a2 100644 > --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > @@ -41,6 +41,7 @@ SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" > SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs" > SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs" > SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" > +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs" > SYSFW_PREFIX_am62axx-evm-k3r5 = "fs" > > SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [EXTERNAL] Re: [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration 2023-02-10 20:15 ` Denys Dmytriyenko @ 2023-02-13 14:19 ` Shilwant, Chirag 0 siblings, 0 replies; 3+ messages in thread From: Shilwant, Chirag @ 2023-02-13 14:19 UTC (permalink / raw) To: Denys Dmytriyenko Cc: Bajjuri, Praneeth, Eatmon, Ryan, meta-ti@lists.yoctoproject.org, Adivi, Sai Sree Kartheek, Bhagat, Paresh, Gupta, Gyan [-- Attachment #1: Type: text/plain, Size: 5456 bytes --] True, but I see that the AM62x and AM62x LP patch is already up on dunfell-wip and the conflict issue seems to be already handled by Ryan. https://git.ti.com/cgit/arago-project/meta-ti/commit/?h=dunfell-wip&id=48b7e6693c750039a4b3df0dc07979f710cf0c12 is adding the k3r5-hs-fs.conf and hence https://git.ti.com/cgit/arago-project/meta-ti/commit/?h=dunfell-wip&id=9fb233214697bc7bb6e796ad2a868cadcd5b9e7d isn't. Also, the AM62A patch which you are mentioning is an RFC. So while re-sending a non-RFC patch we can skip adding k3r5-hs-fs.conf provided above 2 patches are up on dunfell. ________________________________ From: Denys Dmytriyenko <denis@denix.org> Sent: 11 February 2023 01:45:49 To: Shilwant, Chirag Cc: Bajjuri, Praneeth; Eatmon, Ryan; meta-ti@lists.yoctoproject.org; Adivi, Sai Sree Kartheek; Bhagat, Paresh; Gupta, Gyan Subject: [EXTERNAL] Re: [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration I see all 3 patches are trying to add the same new multiconfig file: > create mode 100644 conf/multiconfig/k3r5-hs-fs.conf AM62A: https://patchwork.yoctoproject.org/project/ti/patch/20230210000834.24783-1-s-adivi@ti.com/ AM62: https://patchwork.yoctoproject.org/project/ti/patch/20230210124534.2607360-1-c-shilwant@ti.com/ AM62 LP: https://patchwork.yoctoproject.org/project/ti/patch/20230210124534.2607360-1-c-shilwant@ti.com/ This would cause a conflict and extra work for maintainer... On Fri, Feb 10, 2023 at 06:26:15PM +0530, Chirag Shilwant wrote: > Lets add the basic AM62x LP HS-FS configuration > - Add machine conf for AM62x LP HS-FS. > - The wic images will boot on AM62x LP HS-FS devices by default. The sysfw image for HS-SE will be packaged in the wic image as tiboot3-am62x-hs-evm.bin. > - Add ti-sci-firmware overrides. > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > --- > conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf | 14 ++++++++++++++ > conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 7 +++++++ > conf/machine/include/am62xx-lp.inc | 8 +++++++- > conf/multiconfig/k3r5-hs-fs.conf | 3 +++ > recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + > 5 files changed, 32 insertions(+), 1 deletion(-) > create mode 100644 conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf > create mode 100644 conf/multiconfig/k3r5-hs-fs.conf > > diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf > new file mode 100644 > index 00000000..0178fcfc > --- /dev/null > +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf > @@ -0,0 +1,14 @@ > +#@TYPE: Machine > +#@NAME: AM62xx LPSK HS-FS EVM (R5F) > +#@DESCRIPTION: Machine configuration for the TI AM62xx LP 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-hs-fs" > + > +SYSFW_SOC = "am62x" > +SYSFW_CONFIG = "evm" > +SYSFW_SUFFIX = "hs-fs" > + > +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf > index b752ee7e..37e9760a 100644 > --- a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf > +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf > @@ -11,4 +11,11 @@ SYSFW_SOC = "am62x" > SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "hs" > > +SYSFW_TIBOOT3_SYMLINK = "" > + > UBOOT_MACHINE = "am62x_lpsk_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/include/am62xx-lp.inc b/conf/machine/include/am62xx-lp.inc > index c38de868..02937662 100644 > --- a/conf/machine/include/am62xx-lp.inc > +++ b/conf/machine/include/am62xx-lp.inc > @@ -8,8 +8,14 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" > > TFA_K3_SYSTEM_SUSPEND = "1" > > -# Default tiboot3.bin on AM62x LP is for HS-SE > +# Default tiboot3.bin on AM62x LP is for HS-FS > +BBMULTICONFIG = "k3r5-hs-fs" > +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" > +do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" > + > +# Since default tiboot3.bin on AM62x LP is for HS-FS, 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" > > diff --git a/conf/multiconfig/k3r5-hs-fs.conf b/conf/multiconfig/k3r5-hs-fs.conf > new file mode 100644 > index 00000000..c6d58ead > --- /dev/null > +++ b/conf/multiconfig/k3r5-hs-fs.conf > @@ -0,0 +1,3 @@ > +require k3r5.conf > + > +MACHINE_append = "-hs-fs" > 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..24af66a2 100644 > --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb > @@ -41,6 +41,7 @@ SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" > SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs" > SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs" > SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" > +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs" > SYSFW_PREFIX_am62axx-evm-k3r5 = "fs" > > SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" > -- > 2.34.1 > [-- Attachment #2: Type: text/html, Size: 8917 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-13 14:19 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-02-10 12:56 [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration Chirag Shilwant 2023-02-10 20:15 ` Denys Dmytriyenko 2023-02-13 14:19 ` [EXTERNAL] " Shilwant, Chirag
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.