[meta-ti][master/scarthgap][PATCH] conf: machine: Update UBOOT_MACHINE for am62xxsip-evm

[meta-ti][master/scarthgap][PATCH] conf: machine: Update UBOOT_MACHINE for am62xxsip-evm

[Chirag Shilwant]

Modify the U-Boot defconfig names for A53 and R5
machine configurations based on ti-u-boot-2024.04 [1]

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=df5181f8c6c41bf018ec043d565581b5d8a291c5

Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
---
 meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 7 +------
 meta-ti-bsp/conf/machine/am62xxsip-evm.conf      | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
index 0daff2b9..c35edc6e 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -8,9 +8,4 @@ SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
-# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
-# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
-UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"
+UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
index b5dd18f1..38fe04c9 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -13,4 +13,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
 "
 
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
-- 
2.34.1

Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Update UBOOT_MACHINE for am62xxsip-evm

[Denys Dmytriyenko]

On Fri, Jun 14, 2024 at 12:31:23PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote:
> Modify the U-Boot defconfig names for A53 and R5
> machine configurations based on ti-u-boot-2024.04 [1]
> 
> [1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=df5181f8c6c41bf018ec043d565581b5d8a291c5

If we get the multi-BSP support merged, this would have to be adjusted to NOT 
break builds with 2023.04 U-boot...

Similar to beagleplay and beaglebone-ai64 changes here:
https://patchwork.yoctoproject.org/project/ti/patch/20240613172254.770920-3-denis@denix.org/


> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> ---
>  meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 7 +------
>  meta-ti-bsp/conf/machine/am62xxsip-evm.conf      | 2 +-
>  2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> index 0daff2b9..c35edc6e 100644
> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> @@ -8,9 +8,4 @@ SYSFW_SOC = "am62x"
>  SYSFW_CONFIG = "evm"
>  SYSFW_SUFFIX = "hs-fs"
>  
> -UBOOT_MACHINE = "am62x_evm_r5_defconfig"
> -
> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
> -UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"
> +UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> index b5dd18f1..38fe04c9 100644
> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> @@ -13,4 +13,4 @@ KERNEL_DEVICETREE = " \
>      ti/k3-am625-sk.dtb \
>  "
>  
> -UBOOT_MACHINE = "am62x_evm_a53_defconfig"
> +UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
> -- 
> 2.34.1

Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Update UBOOT_MACHINE for am62xxsip-evm

[Chirag Shilwant]

Hi Denys,

On 14/06/24 22:11, Denys Dmytriyenko wrote:
> On Fri, Jun 14, 2024 at 12:31:23PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote:
>> Modify the U-Boot defconfig names for A53 and R5
>> machine configurations based on ti-u-boot-2024.04 [1]
>>
>> [1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=df5181f8c6c41bf018ec043d565581b5d8a291c5
> If we get the multi-BSP support merged, this would have to be adjusted to NOT
> break builds with 2023.04 U-boot...
>
> Similar to beagleplay and beaglebone-ai64 changes here:
> https://patchwork.yoctoproject.org/project/ti/patch/20240613172254.770920-3-denis@denix.org/



Thanks Denys for the catch! I will send out a new patch on top of 
meta-ti "-next" branch to handle 2023.04 U-boot.
FYI, we can't handle u-boot-ti-mainline which is on 2024.01 [1], as it 
doesn't seem to have a fragment
similar to 2023.04 U-boot nor it has the latest am62xsip* def-configs 
[2]. Hence, I will send out
a patch only to support ti-u-boot-2023.04

[1]: 
https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb#n16

[2]: 
https://source.denx.de/u-boot/u-boot/-/tree/866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e/configs



>
>
>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>> ---
>>   meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 7 +------
>>   meta-ti-bsp/conf/machine/am62xxsip-evm.conf      | 2 +-
>>   2 files changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
>> index 0daff2b9..c35edc6e 100644
>> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
>> @@ -8,9 +8,4 @@ SYSFW_SOC = "am62x"
>>   SYSFW_CONFIG = "evm"
>>   SYSFW_SUFFIX = "hs-fs"
>>   
>> -UBOOT_MACHINE = "am62x_evm_r5_defconfig"
>> -
>> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
>> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
>> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
>> -UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"
>> +UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
>> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
>> index b5dd18f1..38fe04c9 100644
>> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
>> @@ -13,4 +13,4 @@ KERNEL_DEVICETREE = " \
>>       ti/k3-am625-sk.dtb \
>>   "
>>   
>> -UBOOT_MACHINE = "am62x_evm_a53_defconfig"
>> +UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
>> -- 
>> 2.34.1

Re: [EXTERNAL] Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Update UBOOT_MACHINE for am62xxsip-evm

[Chirag Shilwant]

Hi Ryan,

Sent a patch that can be applied on top of master-next & scarthgap-next 
- https://lists.yoctoproject.org/g/meta-ti/message/17750

On 17/06/24 13:56, Chirag Shilwant via lists.yoctoproject.org wrote:
> Hi Denys, On 14/06/24 22: 11, Denys Dmytriyenko wrote: > On Fri, Jun 
> 14, 2024 at 12: 31: 23PM +0530, Chirag Shilwant via 
> lists. yoctoproject. org wrote: >> Modify the U-Boot defconfig names 
> for A53 and R5 >> machine configurations
> ZjQcmQRYFpfptBannerStart
> This message was sent from outside of Texas Instruments.
> Do not click links or open attachments unless you recognize the source 
> of this email and know the content is safe. If you wish to report this 
> message to IT Security, please forward the message as an attachment to 
> phishing@list.ti.com
> ZjQcmQRYFpfptBannerEnd
> Hi Denys,
>
> On 14/06/24 22:11, Denys Dmytriyenko wrote:
> > On Fri, Jun 14, 2024 at 12:31:23PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote:
> >> Modify the U-Boot defconfig names for A53 and R5
> >> machine configurations based on ti-u-boot-2024.04 [1]
> >>
> >> [1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=df5181f8c6c41bf018ec043d565581b5d8a291c5
> > If we get the multi-BSP support merged, this would have to be adjusted to NOT
> > break builds with 2023.04 U-boot...
> >
> > Similar to beagleplay and beaglebone-ai64 changes here:
> > https://urldefense.com/v3/__https://patchwork.yoctoproject.org/project/ti/patch/20240613172254.770920-3-denis@denix.org/__;!!G3vK!U3V_n7wJdfwnX6P_T7k51a23o2sLC9dcUlZx06kX-HdJfreBml0PSj_uDPTUdTzudDdlTSeZ87mqvXNFd2pcReiQqnqpSzJBAz8q$
>
>
>
> Thanks Denys for the catch! I will send out a new patch on top of
> meta-ti "-next" branch to handle 2023.04 U-boot.
> FYI, we can't handle u-boot-ti-mainline which is on 2024.01 [1], as it
> doesn't seem to have a fragment
> similar to 2023.04 U-boot nor it has the latest am62xsip* def-configs
> [2]. Hence, I will send out
> a patch only to support ti-u-boot-2023.04
>
> [1]:
> https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb#n16
>
> [2]:
> https://urldefense.com/v3/__https://source.denx.de/u-boot/u-boot/-/tree/866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e/configs__;!!G3vK!U3V_n7wJdfwnX6P_T7k51a23o2sLC9dcUlZx06kX-HdJfreBml0PSj_uDPTUdTzudDdlTSeZ87mqvXNFd2pcReiQqnqpSxPFUFeQ$
>
>
>
> >
> >
> >> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> >> ---
> >>   meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 7 +------
> >>   meta-ti-bsp/conf/machine/am62xxsip-evm.conf      | 2 +-
> >>   2 files changed, 2 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> >> index 0daff2b9..c35edc6e 100644
> >> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> >> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> >> @@ -8,9 +8,4 @@ SYSFW_SOC = "am62x"
> >>   SYSFW_CONFIG = "evm"
> >>   SYSFW_SUFFIX = "hs-fs"
> >>   
> >> -UBOOT_MACHINE = "am62x_evm_r5_defconfig"
> >> -
> >> -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
> >> -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
> >> -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
> >> -UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"
> >> +UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
> >> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> >> index b5dd18f1..38fe04c9 100644
> >> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> >> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> >> @@ -13,4 +13,4 @@ KERNEL_DEVICETREE = " \
> >>       ti/k3-am625-sk.dtb \
> >>   "
> >>   
> >> -UBOOT_MACHINE = "am62x_evm_a53_defconfig"
> >> +UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
> >> -- 
> >> 2.34.1
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17749): https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/message/17749__;!!G3vK!U3V_n7wJdfwnX6P_T7k51a23o2sLC9dcUlZx06kX-HdJfreBml0PSj_uDPTUdTzudDdlTSeZ87mqvXNFd2pcReiQqnqpSxuP51UT$
> Mute This Topic: https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/106666223/7030289__;!!G3vK!U3V_n7wJdfwnX6P_T7k51a23o2sLC9dcUlZx06kX-HdJfreBml0PSj_uDPTUdTzudDdlTSeZ87mqvXNFd2pcReiQqnqpS3xiea-z$
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/unsub__;!!G3vK!U3V_n7wJdfwnX6P_T7k51a23o2sLC9dcUlZx06kX-HdJfreBml0PSj_uDPTUdTzudDdlTSeZ87mqvXNFd2pcReiQqnqpS-jfrB8R$  [c-shilwant@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [meta-ti][master/scarthgap][PATCH] conf: machine: Update UBOOT_MACHINE for am62xxsip-evm

[Denys Dmytriyenko]

On Mon, Jun 17, 2024 at 01:56:40PM +0530, Chirag Shilwant wrote:
> Hi Denys,
> 
> On 14/06/24 22:11, Denys Dmytriyenko wrote:
> >On Fri, Jun 14, 2024 at 12:31:23PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote:
> >>Modify the U-Boot defconfig names for A53 and R5
> >>machine configurations based on ti-u-boot-2024.04 [1]
> >>
> >>[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=df5181f8c6c41bf018ec043d565581b5d8a291c5
> >If we get the multi-BSP support merged, this would have to be adjusted to NOT
> >break builds with 2023.04 U-boot...
> >
> >Similar to beagleplay and beaglebone-ai64 changes here:
> >https://patchwork.yoctoproject.org/project/ti/patch/20240613172254.770920-3-denis@denix.org/
> 
> 
> 
> Thanks Denys for the catch! I will send out a new patch on top of
> meta-ti "-next" branch to handle 2023.04 U-boot.
> FYI, we can't handle u-boot-ti-mainline which is on 2024.01 [1], as
> it doesn't seem to have a fragment
> similar to 2023.04 U-boot nor it has the latest am62xsip*
> def-configs [2]. Hence, I will send out
> a patch only to support ti-u-boot-2023.04

Ok, I see you covered the mainline question in this thread - please ignore my 
question for the patch I just sent earlier.


> [1]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb#n16
> 
> [2]: https://source.denx.de/u-boot/u-boot/-/tree/866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e/configs
> 
> 
> 
> >
> >
> >>Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> >>---
> >>  meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 7 +------
> >>  meta-ti-bsp/conf/machine/am62xxsip-evm.conf      | 2 +-
> >>  2 files changed, 2 insertions(+), 7 deletions(-)
> >>
> >>diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> >>index 0daff2b9..c35edc6e 100644
> >>--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> >>+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> >>@@ -8,9 +8,4 @@ SYSFW_SOC = "am62x"
> >>  SYSFW_CONFIG = "evm"
> >>  SYSFW_SUFFIX = "hs-fs"
> >>-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
> >>-
> >>-# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
> >>-# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
> >>-# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
> >>-UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"
> >>+UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
> >>diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> >>index b5dd18f1..38fe04c9 100644
> >>--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> >>+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> >>@@ -13,4 +13,4 @@ KERNEL_DEVICETREE = " \
> >>      ti/k3-am625-sk.dtb \
> >>  "
> >>-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
> >>+UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
> >>-- 
> >>2.34.1