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 3A17EC52D7F for ; Wed, 14 Aug 2024 19:23:43 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.106767.1723663416201228830 for ; Wed, 14 Aug 2024 12:23:36 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@ti.com header.s=ti-com-17Q1 header.b=cd44HRYk; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: reatmon@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 47EJNZxo104214; Wed, 14 Aug 2024 14:23:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1723663415; bh=jsTYFi/Kna9sVe+RzLuBB5Jg2jqxsF2HEy+EwuSfECs=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=cd44HRYkwsMiumy/Sd5Wqu4hb6P0Ug/p2q+qXOdnaDIQHIqja4ni9GrZd06fQ3M/N MF9C6VlCdW8PGZDT1CUuF9geCoa+2eAF5Dy6Om2OuXtztyqO0CN5nTFTGKIpZyslAJ ZbeHmP/QRtKOiTjU4R28F855K3xqTePw271dRF1g= Received: from DFLE100.ent.ti.com (dfle100.ent.ti.com [10.64.6.21]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 47EJNZ7j128849 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 14 Aug 2024 14:23:35 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 14 Aug 2024 14:23:34 -0500 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 14 Aug 2024 14:23:35 -0500 Received: from [10.249.36.103] ([10.249.36.103]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 47EJNYtk107627; Wed, 14 Aug 2024 14:23:34 -0500 Message-ID: <982de64d-2196-45cd-9532-bb43e8f40609@ti.com> Date: Wed, 14 Aug 2024 14:23:34 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [meta-ti][master/scarthgap][RFC] conf: machine: am62xx-unified: Create new common am62xx machine To: Chirag Shilwant , Praneeth Bajjuri , Denys Dmytriyenko , CC: Gyan Gupta References: <20240808192718.14154-1-reatmon@ti.com> <11f3d6f8-79e2-48cc-825e-3a05fe6a5050@ti.com> <17EBAE4BFE99D30B.10903@lists.yoctoproject.org> Content-Language: en-US From: Ryan Eatmon In-Reply-To: <17EBAE4BFE99D30B.10903@lists.yoctoproject.org> Content-Type: text/plain; charset="UTF-8"; format=flowed X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by lelv0143.ext.ti.com id 47EJNZxo104214 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 ; Wed, 14 Aug 2024 19:23:43 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17938 On 8/14/2024 2:15 PM, Ryan Eatmon via lists.yoctoproject.org wrote: >=20 >=20 > On 8/14/2024 1:09 PM, Chirag Shilwant wrote: >> Hi Ryan & Denys, >> On 09/08/24 00:57, Ryan Eatmon via lists.yoctoproject.org wrote: >>> To reduce the number of required builds for testing purposes, create=20 >>> a common unified am62xx machine target that can produce all of the=20 >>> files for all of the variant platforms related to am62xx (sip and=20 >>> lp). Additionally, continue to support >>> ZjQcmQRYFpfptBannerStart >>> This message was sent from outside of Texas Instruments. >>> Do not click links or open attachments unless you recognize the=20 >>> source of this email and know the content is safe. If you wish to=20 >>> report this message to IT Security, please forward the message as an=20 >>> attachment to phishing@list.ti.com >>> Report=C2=A0Suspicious >>> >>> ZjQcmQRYFpfptBannerEnd >>> To reduce the number of required builds for testing purposes, create = a >>> common unified am62xx machine target that can produce all of the file= s >>> for all of the variant platforms related to am62xx (sip and lp). >>> Additionally, continue to support building the specific target if >>> desired. >>> >>> Signed-off-by: Ryan Eatmon >> >> >> >> We need to see how do we enable the support of fragment configs with=20 >> UBOOT_CONFIG >> as I see atleast ti-u-boot-2024.04 still following the fragment config= =20 >> model for few usecases. >=20 > I've been working on this topic all day today.=C2=A0 I'll probably have= an=20 > additional RFC version tomorrow once I'm done testing it. >=20 > Once we are happy with everything we can decide if we want to push the=20 > solution to oe-core, or keep it in meta-ti. But to be fair, there are no fragments in the am62xx family. There were=20 back under the 6.1 bsp, but under 6.6 the fragment it is gone. >=20 >> I see two approaches, >> >> - Add the support in oe-core to handle u-boot fragment configs >> >> - Extend u-boot-mergeconfig.inc we currently have in meta-ti [1] to=20 >> support UBOOT_CONFIG >> >> >> Personally, I would prefer the first option if that's acceptable to=20 >> oe-core as well >> but I would like to hear your opinions on the same >> >> >> [1]:=20 >> https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes= -bsp/u-boot/u-boot-mergeconfig.inc?h=3Dscarthgap >> >> >> --- >> Chirag >> >> >> >>> --- >>> =C2=A0 meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf |=C2=A0 9 +--- >>> =C2=A0 meta-ti-bsp/conf/machine/am62xx-evm.conf=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0 5 +-- >>> =C2=A0 .../conf/machine/am62xx-lp-evm-k3r5.conf=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0 9 +--- >>> =C2=A0 meta-ti-bsp/conf/machine/am62xx-lp-evm.conf=C2=A0=C2=A0 |=C2=A0= 5 +-- >>> =C2=A0 .../conf/machine/am62xx-unified-k3r5.conf=C2=A0=C2=A0=C2=A0=C2= =A0 | 20 +++++++++ >>> =C2=A0 meta-ti-bsp/conf/machine/am62xx-unified.conf=C2=A0 | 43 ++++++= +++++++++++++ >>> =C2=A0 .../conf/machine/am62xxsip-evm-k3r5.conf=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0 8 ++-- >>> =C2=A0 meta-ti-bsp/conf/machine/am62xxsip-evm.conf=C2=A0=C2=A0 |=C2=A0= 6 +-- >>> =C2=A0 8 files changed, 76 insertions(+), 29 deletions(-) >>> =C2=A0 create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r= 5.conf >>> =C2=A0 create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.con= f >>> >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf >>> index 548369ca..3a819835 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf >>> @@ -2,11 +2,6 @@ >>> =C2=A0 #@NAME: AM62XX EVM (R5F) >>> =C2=A0 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5= F core) >>> -require conf/machine/include/k3r5.inc >>> -require conf/machine/include/ti-extras.inc >>> +require conf/machine/am62xx-unified-k3r5.conf >>> -SYSFW_SOC =3D "am62x" >>> -SYSFW_CONFIG =3D "evm" >>> -SYSFW_SUFFIX =3D "hs-fs" >>> - >>> -UBOOT_MACHINE =3D "am62x_evm_r5_defconfig" >>> +UBOOT_CONFIG =3D "evm" >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xx-evm.conf >>> index 31de4a14..8c80cb1f 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf >>> @@ -2,8 +2,7 @@ >>> =C2=A0 #@NAME: AM62XX EVM >>> =C2=A0 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM >>> -require conf/machine/include/am62xx.inc >>> -require conf/machine/include/ti-extras.inc >>> +require conf/machine/am62xx-unified.conf >>> =C2=A0 KERNEL_DEVICETREE_PREFIX =3D " \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ti/k3-am625 \ >>> @@ -30,4 +29,4 @@ KERNEL_DEVICETREE =3D " \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ti/k3-am62x-sk-hdmi-audio.dtbo \ >>> =C2=A0 " >>> -UBOOT_MACHINE =3D "am62x_evm_a53_defconfig" >>> +UBOOT_CONFIG =3D "evm" >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >>> index 52b69a72..fb760e99 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >>> @@ -2,11 +2,6 @@ >>> =C2=A0 #@NAME: AM62XX LP GP EVM (R5F) >>> =C2=A0 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP E= VM=20 >>> (R5F core) >>> -require conf/machine/include/k3r5.inc >>> -require conf/machine/include/ti-extras.inc >>> +require conf/machine/am62xx-unified-k3r5.conf >>> -SYSFW_SOC =3D "am62x" >>> -SYSFW_CONFIG =3D "evm" >>> -SYSFW_SUFFIX =3D "hs-fs" >>> - >>> -UBOOT_MACHINE =3D "am62x_lpsk_r5_defconfig" >>> +UBOOT_CONFIG =3D "lpsk" >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >>> index e9271f5b..f7d89d68 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >>> @@ -2,8 +2,7 @@ >>> =C2=A0 #@NAME: AM62XX LP EVM >>> =C2=A0 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM >>> -require conf/machine/include/am62xx.inc >>> -require conf/machine/include/ti-extras.inc >>> +require conf/machine/am62xx-unified.conf >>> =C2=A0 KERNEL_DEVICETREE_PREFIX =3D " \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ti/k3-am62-lp \ >>> @@ -19,4 +18,4 @@ KERNEL_DEVICETREE =3D " \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ti/k3-am62x-sk-hdmi-audio.dtbo \ >>> =C2=A0 " >>> -UBOOT_MACHINE =3D "am62x_lpsk_a53_defconfig" >>> +UBOOT_CONFIG =3D "lpsk" >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf >>> new file mode 100644 >>> index 00000000..7d65e6af >>> --- /dev/null >>> +++ b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf >>> @@ -0,0 +1,20 @@ >>> +#@TYPE: Machine >>> +#@NAME: AM62XX EVM (R5F) >>> +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core= ) >>> + >>> +require conf/machine/include/k3r5.inc >>> +require conf/machine/include/ti-extras.inc >>> + >>> +SYSFW_SOC =3D "am62x" >>> +SYSFW_CONFIG =3D "evm" >>> +SYSFW_SUFFIX =3D "hs-fs" >>> + >>> +UBOOT_MACHINE =3D "" >>> +# Last config in the list is default >>> +UBOOT_CONFIG ??=3D "sip lpsk evm" >>> + >>> +UBOOT_CONFIG:bsp-ti-6_1 ??=3D "evm" >>> + >>> +UBOOT_CONFIG[sip] =3D "am62xsip_evm_r5_defconfig" >>> +UBOOT_CONFIG[lpsk] =3D "am62x_lpsk_r5_defconfig" >>> +UBOOT_CONFIG[evm] =3D "am62x_evm_r5_defconfig" >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-unified.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xx-unified.conf >>> new file mode 100644 >>> index 00000000..5b03239f >>> --- /dev/null >>> +++ b/meta-ti-bsp/conf/machine/am62xx-unified.conf >>> @@ -0,0 +1,43 @@ >>> +#@TYPE: Machine >>> +#@NAME: AM62XX Unified EVM >>> +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all=20 >>> of its variations >>> + >>> +require conf/machine/include/am62xx.inc >>> +require conf/machine/include/ti-extras.inc >>> + >>> +KERNEL_DEVICETREE_PREFIX =3D " \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am62-lp \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625 \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am62x-sk \ >>> +" >>> + >>> +KERNEL_DEVICETREE =3D " \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am62-lp-sk.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-beagleplay.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-phyboard-lyra-rdk.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-sk.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-nonwifi-dahlia.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-nonwifi-dev.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-nonwifi-mallow.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-nonwifi-yavia.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-wifi-dahlia.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-wifi-dev.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-wifi-mallow.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am625-verdin-wifi-yavia.dtb \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am62x-sk-csi2-imx219.dtbo \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am62x-sk-csi2-ov5640.dtbo \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \ >>> +=C2=A0=C2=A0=C2=A0 ti/k3-am62x-sk-hdmi-audio.dtbo \ >>> +" >>> + >>> +UBOOT_MACHINE =3D "" >>> +# Last config in the list is default >>> +UBOOT_CONFIG ??=3D "sip lpsk evm" >>> + >>> +UBOOT_CONFIG:bsp-ti-6_1 ??=3D "lpsk evm" >>> + >>> +UBOOT_CONFIG[sip] =3D "am62xsip_evm_a53_defconfig" >>> +UBOOT_CONFIG[lpsk] =3D "am62x_lpsk_a53_defconfig" >>> +UBOOT_CONFIG[evm] =3D "am62x_evm_a53_defconfig" >>> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf >>> index 55bc530b..ab538ff3 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf >>> @@ -2,13 +2,11 @@ >>> =C2=A0 #@NAME: AM62XX SIP EVM (R5F) >>> =C2=A0 #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM= (R5F=20 >>> core) >>> -require conf/machine/include/k3r5.inc >>> +require conf/machine/am62xx-unified-k3r5.conf >>> -SYSFW_SOC =3D "am62x" >>> -SYSFW_CONFIG =3D "evm" >>> -SYSFW_SUFFIX =3D "hs-fs" >>> +UBOOT_CONFIG =3D "sip" >>> -UBOOT_MACHINE =3D "am62xsip_evm_r5_defconfig" >>> +UBOOT_CONFIG:bsp-ti-6_1 =3D "" >>> =C2=A0 UBOOT_MACHINE:bsp-ti-6_1 =3D "am62x_evm_r5_defconfig" >>> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf=20 >>> b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf >>> index 8104329e..6b179b80 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf >>> @@ -2,7 +2,7 @@ >>> =C2=A0 #@NAME: AM62XX SIP EVM >>> =C2=A0 #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM >>> -require conf/machine/include/am62xx.inc >>> +require conf/machine/am62xx-unified.conf >>> =C2=A0 KERNEL_DEVICETREE_PREFIX =3D " \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ti/k3-am625 \ >>> @@ -13,6 +13,4 @@ KERNEL_DEVICETREE =3D " \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ti/k3-am625-sk.dtb \ >>> =C2=A0 " >>> -UBOOT_MACHINE =3D "am62xsip_evm_a53_defconfig" >>> - >>> -UBOOT_MACHINE:bsp-ti-6_1 =3D "am62x_evm_a53_defconfig" >>> +UBOOT_CONFIG =3D "sip" >>> --=20 >>> 2.17.1 >>> >>> >>> >>> >=20 >=20 >=20 > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- > Links: You receive all messages sent to this group. > View/Reply Online (#17937): https://lists.yoctoproject.org/g/meta-ti/me= ssage/17937 > Mute This Topic: https://lists.yoctoproject.org/mt/107796202/6551054 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti= .com] > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- >=20 --=20 Ryan Eatmon reatmon@ti.com ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS