| Message ID | 20240522130057.1346796-1-c-shilwant@ti.com |
|---|---|
| State | Rejected |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/scarthgap] conf: machine: Update UBOOT_MACHINE for am62xx-lp-evm | expand |
This changes make scarthgap and master incompatible with the current default for uboot... 2024.04 is not the default yet. Why was this change made in uboot? We cannot accept this change until we default to 2024.04. On 5/22/2024 8:00 AM, Chirag Shilwant 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=781b6a4a9ffde2428484d5c061b80e6c192b2049 > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > --- > meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- > meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > index 52b69a72..ddcd79c4 100644 > --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > @@ -9,4 +9,4 @@ SYSFW_SOC = "am62x" > SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "hs-fs" > > -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > +UBOOT_MACHINE = "am62x_lp_sk_r5_defconfig" > diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > index 51e99728..9ffb9898 100644 > --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > @@ -17,4 +17,4 @@ KERNEL_DEVICETREE = " \ > ti/k3-am62-lp-sk.dtb \ > " > > -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" > +UBOOT_MACHINE = "am62x_lp_sk_a53_defconfig"
On 5/22/2024 8:00 AM, Chirag Shilwant 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=781b6a4a9ffde2428484d5c061b80e6c192b2049 > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > --- > meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- > meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > index 52b69a72..ddcd79c4 100644 > --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > @@ -9,4 +9,4 @@ SYSFW_SOC = "am62x" > SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "hs-fs" > > -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > +UBOOT_MACHINE = "am62x_lp_sk_r5_defconfig" > diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > index 51e99728..9ffb9898 100644 > --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > @@ -17,4 +17,4 @@ KERNEL_DEVICETREE = " \ > ti/k3-am62-lp-sk.dtb \ > " > > -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" > +UBOOT_MACHINE = "am62x_lp_sk_a53_defconfig" These changes will break the current default uboot version in scarthgap/master. You need to do one of two things: 1) If this change is only in the ti uboot 2024.04 version right now then the u-boot-ti-staging-2024.04.bb recipe should have the lines above to change UBOOT_MACHINE for these two entries. We can then migrate these lines to the configs once all of the default versions are in place. 2) If the change is in both the ti version AND in upstream, then we need to make the flip changes above in the 2023.04 version to keep the names it is known by there. Bottom line, while we are still in the migration time for this change we will need to do extra work to support both flows. We can then unravel these changes at a later time once all of the uboot versions support the new defconfig name.
+ Bryan for providing more details on the u-boot defconfig name change for am62xx-lp-evm On 22/05/24 18:46, Ryan Eatmon wrote: > > This changes make scarthgap and master incompatible with the current > default for uboot... 2024.04 is not the default yet. Why was this > change made in uboot? > > We cannot accept this change until we default to 2024.04. Hi Ryan, How should we plan to enable am62xx-lp-evm scarthgap builds? Delaying the am62xx-lp-evm builds after ltsprep may not be advisable. > > > > On 5/22/2024 8:00 AM, Chirag Shilwant 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=781b6a4a9ffde2428484d5c061b80e6c192b2049 >> >> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> >> --- >> meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- >> meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >> b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >> index 52b69a72..ddcd79c4 100644 >> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >> @@ -9,4 +9,4 @@ SYSFW_SOC = "am62x" >> SYSFW_CONFIG = "evm" >> SYSFW_SUFFIX = "hs-fs" >> -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" >> +UBOOT_MACHINE = "am62x_lp_sk_r5_defconfig" >> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >> b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >> index 51e99728..9ffb9898 100644 >> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >> @@ -17,4 +17,4 @@ KERNEL_DEVICETREE = " \ >> ti/k3-am62-lp-sk.dtb \ >> " >> -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" >> +UBOOT_MACHINE = "am62x_lp_sk_a53_defconfig" >
On 5/22/2024 8:36 AM, Chirag Shilwant wrote: > + Bryan for providing more details on the u-boot defconfig name change > for am62xx-lp-evm > > On 22/05/24 18:46, Ryan Eatmon wrote: >> >> This changes make scarthgap and master incompatible with the current >> default for uboot... 2024.04 is not the default yet. Why was this >> change made in uboot? >> >> We cannot accept this change until we default to 2024.04. > > > Hi Ryan, > > How should we plan to enable am62xx-lp-evm scarthgap builds? > Delaying the am62xx-lp-evm builds after ltsprep may not be advisable. > See my other reply to the orig message. >> >> >> >> On 5/22/2024 8:00 AM, Chirag Shilwant 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=781b6a4a9ffde2428484d5c061b80e6c192b2049 >>> >>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> >>> --- >>> meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- >>> meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- >>> 2 files changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >>> b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >>> index 52b69a72..ddcd79c4 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf >>> @@ -9,4 +9,4 @@ SYSFW_SOC = "am62x" >>> SYSFW_CONFIG = "evm" >>> SYSFW_SUFFIX = "hs-fs" >>> -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" >>> +UBOOT_MACHINE = "am62x_lp_sk_r5_defconfig" >>> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >>> b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >>> index 51e99728..9ffb9898 100644 >>> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >>> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf >>> @@ -17,4 +17,4 @@ KERNEL_DEVICETREE = " \ >>> ti/k3-am62-lp-sk.dtb \ >>> " >>> -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" >>> +UBOOT_MACHINE = "am62x_lp_sk_a53_defconfig" >>
On May 22, 2024 thus sayeth Ryan Eatmon: > > > On 5/22/2024 8:00 AM, Chirag Shilwant 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=781b6a4a9ffde2428484d5c061b80e6c192b2049 > > > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > > --- > > meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- > > meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > > index 52b69a72..ddcd79c4 100644 > > --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > > +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > > @@ -9,4 +9,4 @@ SYSFW_SOC = "am62x" > > SYSFW_CONFIG = "evm" > > SYSFW_SUFFIX = "hs-fs" > > -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > > +UBOOT_MACHINE = "am62x_lp_sk_r5_defconfig" > > diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > > index 51e99728..9ffb9898 100644 > > --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > > +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > > @@ -17,4 +17,4 @@ KERNEL_DEVICETREE = " \ > > ti/k3-am62-lp-sk.dtb \ > > " > > -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" > > +UBOOT_MACHINE = "am62x_lp_sk_a53_defconfig" > > > These changes will break the current default uboot version in > scarthgap/master. You need to do one of two things: > > 1) If this change is only in the ti uboot 2024.04 version right now then > the u-boot-ti-staging-2024.04.bb recipe should have the lines above to > change UBOOT_MACHINE for these two entries. We can then migrate these lines > to the configs once all of the default versions are in place. > > 2) If the change is in both the ti version AND in upstream, then we need to > make the flip changes above in the 2023.04 version to keep the names it is > known by there. > > Bottom line, while we are still in the migration time for this change we > will need to do extra work to support both flows. We can then unravel these > changes at a later time once all of the uboot versions support the new > defconfig name. > Ah this is my bad. I added and extra underscore when sending out these configs to the U-Boot mailing list. I'll send a patch to our vendor tree to fix this up and fixup the name for v2 for the patches to Tom We can safely drop this patch. Thanks Chirag. ~Bryan
On Wed, May 22, 2024 at 07:06:25PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote: > + Bryan for providing more details on the u-boot defconfig name > change for am62xx-lp-evm > > On 22/05/24 18:46, Ryan Eatmon wrote: > > > >This changes make scarthgap and master incompatible with the > >current default for uboot... 2024.04 is not the default yet. Why > >was this change made in uboot? > > > >We cannot accept this change until we default to 2024.04. > > > Hi Ryan, > > How should we plan to enable am62xx-lp-evm scarthgap builds? > Delaying the am62xx-lp-evm builds after ltsprep may not be advisable. You can put as a machine override in ltsprep branding in meta-arago for now. > >On 5/22/2024 8:00 AM, Chirag Shilwant 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=781b6a4a9ffde2428484d5c061b80e6c192b2049 > >> > >>Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > >>--- > >> meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- > >> meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- > >> 2 files changed, 2 insertions(+), 2 deletions(-) > >> > >>diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > >>b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > >>index 52b69a72..ddcd79c4 100644 > >>--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > >>+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf > >>@@ -9,4 +9,4 @@ SYSFW_SOC = "am62x" > >> SYSFW_CONFIG = "evm" > >> SYSFW_SUFFIX = "hs-fs" > >> -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" > >>+UBOOT_MACHINE = "am62x_lp_sk_r5_defconfig" > >>diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > >>b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > >>index 51e99728..9ffb9898 100644 > >>--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > >>+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf > >>@@ -17,4 +17,4 @@ KERNEL_DEVICETREE = " \ > >> ti/k3-am62-lp-sk.dtb \ > >> " > >> -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" > >>+UBOOT_MACHINE = "am62x_lp_sk_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf index 52b69a72..ddcd79c4 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -9,4 +9,4 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs-fs" -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" +UBOOT_MACHINE = "am62x_lp_sk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index 51e99728..9ffb9898 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -17,4 +17,4 @@ KERNEL_DEVICETREE = " \ ti/k3-am62-lp-sk.dtb \ " -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" +UBOOT_MACHINE = "am62x_lp_sk_a53_defconfig"
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=781b6a4a9ffde2428484d5c061b80e6c192b2049 Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> --- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)