From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78684C636D4 for ; Mon, 13 Feb 2023 14:19:28 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.15192.1676297960550698735 for ; Mon, 13 Feb 2023 06:19:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=xTGOqRD5; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: c-shilwant@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 31DEJFSf043748; Mon, 13 Feb 2023 08:19:15 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1676297955; bh=2MY1np6hh44zT4GFzZj+TGa3X1RarbltAFNuh4mZV7c=; h=From:To:CC:Subject:Date:References:In-Reply-To; b=xTGOqRD5af++BHuvsCqojLVmci7s2FMRzG4Lj+Bk3gxA/XF+4PTbnPIq7iPEEcBaa x6mRaaFgrYsQ2sFT1B6IznTVdQ8jJsmhDXCJsaV3X/nqYoIgAmqMJhvVSIFjALec08 coSvitw5jrPytvraf8tOA2+8+2+F5u4yY9/UajUc= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 31DEJFju018104 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 13 Feb 2023 08:19:15 -0600 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Mon, 13 Feb 2023 08:19:15 -0600 Received: from DLEE113.ent.ti.com ([fe80::a10b:711a:6ba7:e455]) by DLEE113.ent.ti.com ([fe80::a10b:711a:6ba7:e455%17]) with mapi id 15.01.2507.016; Mon, 13 Feb 2023 08:19:14 -0600 From: "Shilwant, Chirag" To: Denys Dmytriyenko CC: "Bajjuri, Praneeth" , "Eatmon, Ryan" , "meta-ti@lists.yoctoproject.org" , "Adivi, Sai Sree Kartheek" , "Bhagat, Paresh" , "Gupta, Gyan" Subject: Re: [EXTERNAL] Re: [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration Thread-Topic: [EXTERNAL] Re: [meta-ti][dunfell][PATCH] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration Thread-Index: AQHZPYyKWDiY/rPW3EqrZWwOfPkpQ67M8BFp Date: Mon, 13 Feb 2023 14:19:14 +0000 Message-ID: References: <20230210125615.2607653-1-c-shilwant@ti.com>,<20230210201549.GA22689@denix.org> In-Reply-To: <20230210201549.GA22689@denix.org> Accept-Language: en-IN, en-US Content-Language: en-IN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.24.69.146] x-exclaimer-md-config: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Content-Type: multipart/alternative; boundary="_000_e901ea4ca84346c887bc0bc1c27064eaticom_" MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 13 Feb 2023 14:19:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15823 --_000_e901ea4ca84346c887bc0bc1c27064eaticom_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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=3Ddunfell-wip&id=3D= 48b7e6693c750039a4b3df0dc07979f710cf0c12 is adding the k3r5-hs-fs.conf and = hence https://git.ti.com/cgit/arago-project/meta-ti/commit/?h=3Ddunfell-wip= &id=3D9fb233214697bc7bb6e796ad2a868cadcd5b9e7d isn't. Also, the AM62A patch which you are mentioning is an RFC. So while re-sendi= ng a non-RFC patch we can skip adding k3r5-hs-fs.conf provided above 2 patc= hes are up on dunfell. ________________________________ From: Denys Dmytriyenko 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 sysf= w 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 > --- > 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/am= 62xx-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 =3D ":k3r5-hs-fs" > + > +SYSFW_SOC =3D "am62x" > +SYSFW_CONFIG =3D "evm" > +SYSFW_SUFFIX =3D "hs-fs" > + > +UBOOT_MACHINE =3D "am62x_lpsk_r5_defconfig" > diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/conf/machine/am= 62xx-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 =3D "am62x" > SYSFW_CONFIG =3D "evm" > SYSFW_SUFFIX =3D "hs" > > +SYSFW_TIBOOT3_SYMLINK =3D "" > + > UBOOT_MACHINE =3D "am62x_lpsk_r5_defconfig" > + > +SPL_BINARY =3D "" > +UBOOT_BINARY =3D "u-boot-spl.${UBOOT_SUFFIX}" > +UBOOT_IMAGE =3D "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_S= UFFIX}" > +UBOOT_SYMLINK =3D "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" > diff --git a/conf/machine/include/am62xx-lp.inc b/conf/machine/include/am= 62xx-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 =3D "${SERIAL_CONSOLES}" > > TFA_K3_SYSTEM_SUSPEND =3D "1" > > -# Default tiboot3.bin on AM62x LP is for HS-SE > +# Default tiboot3.bin on AM62x LP is for HS-FS > +BBMULTICONFIG =3D "k3r5-hs-fs" > +do_image_wic[mcdepends] =3D "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" > +do_image_tar[mcdepends] =3D "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 +=3D "k3r5-hs-se" > +IMAGE_BOOT_FILES +=3D " tiboot3-am62x-hs-evm.bin" > do_image_wic[mcdepends] +=3D "mc::k3r5-hs-se:ti-sci-fw:do_deploy" > do_image_tar[mcdepends] +=3D "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 =3D "-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 =3D "fs" > SYSFW_PREFIX_am62xx-evm-k3r5-hs-se =3D "fs" > SYSFW_PREFIX_am62xx-lp-evm-k3r5 =3D "fs" > SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se =3D "fs" > +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs =3D "fs" > SYSFW_PREFIX_am62axx-evm-k3r5 =3D "fs" > > SYSFW_TISCI =3D "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-= *.bin" > -- > 2.34.1 > --_000_e901ea4ca84346c887bc0bc1c27064eaticom_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

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/comm= it/?h=3Ddunfell-wip&id=3D48b7e6693c750039a4b3df0dc07979f710cf0c12&n= bsp;is adding the k3r5-hs-fs.conf and hence https://git.ti.com/cgit/arago-project/meta-ti/commit/?h=3Ddunfell-wip&i= d=3D9fb233214697bc7bb6e796ad2a868cadcd5b9e7d isn't.


Also, the AM62A patch which you are mentioning is an RFC. So while re-sendi= ng a non-RFC patch we can skip adding k3r5-hs-fs.conf provided above 2 patc= hes are up on dunfell.

From: Denys Dmytriyenko &= lt;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/p= atch/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 s= ysfw 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 +++&= #43;++++++++++
>  conf/machine/am62xx-lp-evm-k3r5-hs-se.conf |  7 ++&= #43;++++
>  conf/machine/include/am62xx-lp.inc     =     |  8 +++++++-
>  conf/multiconfig/k3r5-hs-fs.conf     &n= bsp;     |  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 E= VM (R5F core)
> +
> +# Booting HS-FS requires different SYSFW, the rest is handled at = runtime
> +
> +require conf/machine/include/k3r5.inc
> +SOC_FAMILY_append =3D ":k3r5-hs-fs"
> +
> +SYSFW_SOC =3D "am62x"
> +SYSFW_CONFIG =3D "evm"
> +SYSFW_SUFFIX =3D "hs-fs"
> +
> +UBOOT_MACHINE =3D "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 =3D "am62x"
>  SYSFW_CONFIG =3D "evm"
>  SYSFW_SUFFIX =3D "hs"
> 
> +SYSFW_TIBOOT3_SYMLINK =3D ""
> +
>  UBOOT_MACHINE =3D "am62x_lpsk_r5_defconfig"
> +
> +SPL_BINARY =3D ""
> +UBOOT_BINARY =3D "u-boot-spl.${UBOOT_SUFFIX}"
> +UBOOT_IMAGE =3D "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${P= R}.${UBOOT_SUFFIX}"
> +UBOOT_SYMLINK =3D "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"<= br> > 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 =3D "${SERIAL_CONSOLES= }"
> 
>  TFA_K3_SYSTEM_SUSPEND =3D "1"
> 
> -# Default tiboot3.bin on AM62x LP is for HS-SE
> +# Default tiboot3.bin on AM62x LP is for HS-FS
> +BBMULTICONFIG =3D "k3r5-hs-fs"
> +do_image_wic[mcdepends] =3D "mc::k3r5-hs-fs:ti-sci-fw:do_dep= loy"
> +do_image_tar[mcdepends] =3D "mc::k3r5-hs-fs:ti-sci-fw:do_dep= loy"
> +
> +# Since default tiboot3.bin on AM62x LP is for HS-FS, add a versi= on for HS-SE
>  BBMULTICONFIG +=3D "k3r5-hs-se"
> +IMAGE_BOOT_FILES +=3D " tiboot3-am62x-hs-evm.bin" >  do_image_wic[mcdepends] +=3D "mc::k3r5-hs-se:ti-sci-fw:= do_deploy"
>  do_image_tar[mcdepends] +=3D "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 =3D "-hs-fs"
> diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-s= ci-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 =3D "fs&quo= t;
>  SYSFW_PREFIX_am62xx-evm-k3r5-hs-se =3D "fs"
>  SYSFW_PREFIX_am62xx-lp-evm-k3r5 =3D "fs"
>  SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se =3D "fs"
> +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs =3D "fs"
>  SYSFW_PREFIX_am62axx-evm-k3r5 =3D "fs"
> 
>  SYSFW_TISCI =3D "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-= ${SYSFW_SOC}-*.bin"
> --
> 2.34.1
>
--_000_e901ea4ca84346c887bc0bc1c27064eaticom_--