diff mbox series

[meta-ti,master/kirkstone,RFC,4/9] u-boot-bb.org: Remove this recipe

Message ID 20230425172345.12293-5-afd@ti.com
State RFC
Delegated to: Ryan Eatmon
Headers show
Series Switch to U-Boot binman | expand

Commit Message

Andrew Davis April 25, 2023, 5:23 p.m. UTC 
This will no longer build after we switch away from k3-image-gen. Remove
this version until it can be rebased on the latest U-Boot with binman
support. For now switch current users of this over to u-boot-ti v2021.01.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 meta-ti-bsp/conf/machine/beagle-x15.conf      |  2 --
 .../conf/machine/beaglebone-ai64-k3r5.conf    |  3 ---
 meta-ti-bsp/conf/machine/beaglebone-ai64.conf |  2 --
 meta-ti-bsp/conf/machine/beaglebone.conf      |  2 --
 meta-ti-bsp/conf/machine/beagleplay-k3r5.conf |  3 ---
 meta-ti-bsp/conf/machine/beagleplay.conf      |  2 --
 .../recipes-bsp/u-boot/u-boot-bb.org_git.bb   | 24 -------------------
 7 files changed, 38 deletions(-)
 delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb

Comments

Denys Dmytriyenko April 27, 2023, 8:31 p.m. UTC | #1 
On Tue, Apr 25, 2023 at 12:23:40PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> This will no longer build after we switch away from k3-image-gen. Remove
> this version until it can be rebased on the latest U-Boot with binman
> support.

> For now switch current users of this over to u-boot-ti v2021.01.

This comment is not very clear - aren't you also removing that here?

Would it be possible to preserve at least Beagle build flows intact? Can 
the existing ti-sci-fw recipe that uses k3-image-gen be kept for now 
alongside the new one, e.g. move it to ti-sci-fw-legacy or something?


> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  meta-ti-bsp/conf/machine/beagle-x15.conf      |  2 --
>  .../conf/machine/beaglebone-ai64-k3r5.conf    |  3 ---
>  meta-ti-bsp/conf/machine/beaglebone-ai64.conf |  2 --
>  meta-ti-bsp/conf/machine/beaglebone.conf      |  2 --
>  meta-ti-bsp/conf/machine/beagleplay-k3r5.conf |  3 ---
>  meta-ti-bsp/conf/machine/beagleplay.conf      |  2 --
>  .../recipes-bsp/u-boot/u-boot-bb.org_git.bb   | 24 -------------------
>  7 files changed, 38 deletions(-)
>  delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
> 
> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> index fb52245b..be27705c 100644
> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> @@ -5,8 +5,6 @@
>  require conf/machine/include/am57xx.inc
>  
>  PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>  
>  KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
>  
> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
> index 7c99b5d4..b893f380 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
> @@ -4,9 +4,6 @@
>  
>  require conf/machine/include/k3r5.inc
>  
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
> -
>  SYSFW_SOC = "j721e"
>  SYSFW_CONFIG = "evm"
>  SYSFW_SUFFIX = "gp"
> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> index 304cbb62..bd5f541f 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> @@ -7,8 +7,6 @@ require conf/machine/include/j721e.inc
>  UBOOT_MACHINE = "j721e_evm_a72_config"
>  
>  PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>  
>  KERNEL_DEVICETREE = " \
>  ti/k3-j721e-beagleboneai64.dtb \
> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> index dceef1db..2d811d0d 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> @@ -5,8 +5,6 @@
>  require conf/machine/include/ti33x.inc
>  
>  PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>  
>  KERNEL_DEVICETREE_PREFIX = "am335x-bone"
>  
> diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> index c40615c9..f8f08d63 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> @@ -4,9 +4,6 @@
>  
>  require conf/machine/include/k3r5.inc
>  
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
> -
>  SYSFW_SOC = "am62x"
>  SYSFW_CONFIG = "evm"
>  SYSFW_SUFFIX = "gp"
> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> index e8d25cd9..f4f6a49c 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> @@ -20,8 +20,6 @@ OPTEEMACHINE = "k3-am62x"
>  UBOOT_MACHINE = "am62x_evm_a53_defconfig"
>  
>  PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>  
>  KERNEL_DEVICETREE = " \
>  ti/k3-am625-beagleplay.dtb \
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
> deleted file mode 100644
> index 4e4688aa..00000000
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -require u-boot-ti.inc
> -
> -SUMMARY = "BeagleBoard.org U-Boot"
> -
> -COMPATIBLE_MACHINE = "beagle.*"
> -
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
> -
> -PV = "2021.01"
> -
> -UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
> -UBOOT_GIT_PROTOCOL = "https"
> -BRANCH = "v2021.01-ti-08.05.00.005-SDK-8.5"
> -SRCREV = "46ff4982b41067e5c93369bddd49b1541856d80b"
> -
> -BRANCH:beaglebone-ai64 = "v2021.01-ti-08.05.00.001"
> -BRANCH:beaglebone-ai64-k3r5 = "v2021.01-ti-08.05.00.001"
> -SRCREV:beaglebone-ai64 = "ea96725b5156135d5875415f75d2188f6f56622a"
> -SRCREV:beaglebone-ai64-k3r5 = "ea96725b5156135d5875415f75d2188f6f56622a"
> -
> -BRANCH:beagleplay = "v2021.01-ti-BeaglePlay-Release"
> -BRANCH:beagleplay-k3r5 = "v2021.01-ti-BeaglePlay-Release"
> -SRCREV:beagleplay = "f036fbdc25941d7585182d2552c767edb9b04114"
> -SRCREV:beagleplay-k3r5 = "f036fbdc25941d7585182d2552c767edb9b04114"
> -- 
> 2.39.2
Andrew Davis April 28, 2023, 3:13 p.m. UTC | #2 
On 4/27/23 3:31 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 25, 2023 at 12:23:40PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> This will no longer build after we switch away from k3-image-gen. Remove
>> this version until it can be rebased on the latest U-Boot with binman
>> support.
> 
>> For now switch current users of this over to u-boot-ti v2021.01.
> 
> This comment is not very clear - aren't you also removing that here?
> 

Not here, I do that in the *next* patch :)

I usually sort my patches from least to most controversial, so the first
3-4 can be taken stopping here without breaking as much.

> Would it be possible to preserve at least Beagle build flows intact? Can
> the existing ti-sci-fw recipe that uses k3-image-gen be kept for now
> alongside the new one, e.g. move it to ti-sci-fw-legacy or something?
> 

I have found no such way :(

All the multiconf and deploy logic expects k3-image-gen and now needs
moved over to the new way. Supporting both would mean forking almost
everything removed by this series.

The benefit is not there IMHO since the beagle platforms should boot
almost exactly the same on our TI tree as the bb.org version.

Moving forward, bb.org will also have to make this migration as
k3-image-gen will soon be deprecated. When they do, if we still want
their fork in meta-ti we can bring it back in.

Andrew

> 
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   meta-ti-bsp/conf/machine/beagle-x15.conf      |  2 --
>>   .../conf/machine/beaglebone-ai64-k3r5.conf    |  3 ---
>>   meta-ti-bsp/conf/machine/beaglebone-ai64.conf |  2 --
>>   meta-ti-bsp/conf/machine/beaglebone.conf      |  2 --
>>   meta-ti-bsp/conf/machine/beagleplay-k3r5.conf |  3 ---
>>   meta-ti-bsp/conf/machine/beagleplay.conf      |  2 --
>>   .../recipes-bsp/u-boot/u-boot-bb.org_git.bb   | 24 -------------------
>>   7 files changed, 38 deletions(-)
>>   delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
>>
>> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> index fb52245b..be27705c 100644
>> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
>> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> @@ -5,8 +5,6 @@
>>   require conf/machine/include/am57xx.inc
>>   
>>   PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>>   
>>   KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
>>   
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
>> index 7c99b5d4..b893f380 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
>> @@ -4,9 +4,6 @@
>>   
>>   require conf/machine/include/k3r5.inc
>>   
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>> -
>>   SYSFW_SOC = "j721e"
>>   SYSFW_CONFIG = "evm"
>>   SYSFW_SUFFIX = "gp"
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> index 304cbb62..bd5f541f 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> @@ -7,8 +7,6 @@ require conf/machine/include/j721e.inc
>>   UBOOT_MACHINE = "j721e_evm_a72_config"
>>   
>>   PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>>   
>>   KERNEL_DEVICETREE = " \
>>   ti/k3-j721e-beagleboneai64.dtb \
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
>> index dceef1db..2d811d0d 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
>> @@ -5,8 +5,6 @@
>>   require conf/machine/include/ti33x.inc
>>   
>>   PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>>   
>>   KERNEL_DEVICETREE_PREFIX = "am335x-bone"
>>   
>> diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
>> index c40615c9..f8f08d63 100644
>> --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
>> +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
>> @@ -4,9 +4,6 @@
>>   
>>   require conf/machine/include/k3r5.inc
>>   
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>> -
>>   SYSFW_SOC = "am62x"
>>   SYSFW_CONFIG = "evm"
>>   SYSFW_SUFFIX = "gp"
>> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
>> index e8d25cd9..f4f6a49c 100644
>> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
>> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
>> @@ -20,8 +20,6 @@ OPTEEMACHINE = "k3-am62x"
>>   UBOOT_MACHINE = "am62x_evm_a53_defconfig"
>>   
>>   PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
>> -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
>>   
>>   KERNEL_DEVICETREE = " \
>>   ti/k3-am625-beagleplay.dtb \
>> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
>> deleted file mode 100644
>> index 4e4688aa..00000000
>> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
>> +++ /dev/null
>> @@ -1,24 +0,0 @@
>> -require u-boot-ti.inc
>> -
>> -SUMMARY = "BeagleBoard.org U-Boot"
>> -
>> -COMPATIBLE_MACHINE = "beagle.*"
>> -
>> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
>> -
>> -PV = "2021.01"
>> -
>> -UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
>> -UBOOT_GIT_PROTOCOL = "https"
>> -BRANCH = "v2021.01-ti-08.05.00.005-SDK-8.5"
>> -SRCREV = "46ff4982b41067e5c93369bddd49b1541856d80b"
>> -
>> -BRANCH:beaglebone-ai64 = "v2021.01-ti-08.05.00.001"
>> -BRANCH:beaglebone-ai64-k3r5 = "v2021.01-ti-08.05.00.001"
>> -SRCREV:beaglebone-ai64 = "ea96725b5156135d5875415f75d2188f6f56622a"
>> -SRCREV:beaglebone-ai64-k3r5 = "ea96725b5156135d5875415f75d2188f6f56622a"
>> -
>> -BRANCH:beagleplay = "v2021.01-ti-BeaglePlay-Release"
>> -BRANCH:beagleplay-k3r5 = "v2021.01-ti-BeaglePlay-Release"
>> -SRCREV:beagleplay = "f036fbdc25941d7585182d2552c767edb9b04114"
>> -SRCREV:beagleplay-k3r5 = "f036fbdc25941d7585182d2552c767edb9b04114"
>> -- 
>> 2.39.2
Denys Dmytriyenko May 2, 2023, 7:38 p.m. UTC | #3 
On Fri, Apr 28, 2023 at 10:13:26AM -0500, Andrew Davis wrote:
> On 4/27/23 3:31 PM, Denys Dmytriyenko wrote:
> >On Tue, Apr 25, 2023 at 12:23:40PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> >>This will no longer build after we switch away from k3-image-gen. Remove
> >>this version until it can be rebased on the latest U-Boot with binman
> >>support.
> >
> >>For now switch current users of this over to u-boot-ti v2021.01.
> >
> >This comment is not very clear - aren't you also removing that here?
> 
> Not here, I do that in the *next* patch :)
> 
> I usually sort my patches from least to most controversial, so the first
> 3-4 can be taken stopping here without breaking as much.
> 
> >Would it be possible to preserve at least Beagle build flows intact? Can
> >the existing ti-sci-fw recipe that uses k3-image-gen be kept for now
> >alongside the new one, e.g. move it to ti-sci-fw-legacy or something?
> 
> I have found no such way :(
> 
> All the multiconf and deploy logic expects k3-image-gen and now needs
> moved over to the new way. Supporting both would mean forking almost
> everything removed by this series.

But on the other hand, BBAI64 and BeaglePlay only support GP and don't set any 
additional multiconfigs besides the main k3r5. I feel like creating a separate 
ti-sci-fw-bb.org with k3-image-gen might be possible. But I haven't tried that 
myself yet...


> The benefit is not there IMHO since the beagle platforms should boot
> almost exactly the same on our TI tree as the bb.org version.
> 
> Moving forward, bb.org will also have to make this migration as
> k3-image-gen will soon be deprecated. When they do, if we still want
> their fork in meta-ti we can bring it back in.

The issue is that it will take time for bb.org to switch over to the latest TI 
6.1 kernel and 2023 U-boot with binman. Moreover, they only support Debian, so 
don't expect timely OE recipe updates. And in all this potentially long time 
there won't be any OE support for BB platforms. But there are active OE BB 
users here and I'm trying to find a way to not throw them under the bus...
Andrew Davis May 4, 2023, 2 p.m. UTC | #4 
On 5/2/23 2:38 PM, Denys Dmytriyenko wrote:
> On Fri, Apr 28, 2023 at 10:13:26AM -0500, Andrew Davis wrote:
>> On 4/27/23 3:31 PM, Denys Dmytriyenko wrote:
>>> On Tue, Apr 25, 2023 at 12:23:40PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>>>> This will no longer build after we switch away from k3-image-gen. Remove
>>>> this version until it can be rebased on the latest U-Boot with binman
>>>> support.
>>>
>>>> For now switch current users of this over to u-boot-ti v2021.01.
>>>
>>> This comment is not very clear - aren't you also removing that here?
>>
>> Not here, I do that in the *next* patch :)
>>
>> I usually sort my patches from least to most controversial, so the first
>> 3-4 can be taken stopping here without breaking as much.
>>
>>> Would it be possible to preserve at least Beagle build flows intact? Can
>>> the existing ti-sci-fw recipe that uses k3-image-gen be kept for now
>>> alongside the new one, e.g. move it to ti-sci-fw-legacy or something?
>>
>> I have found no such way :(
>>
>> All the multiconf and deploy logic expects k3-image-gen and now needs
>> moved over to the new way. Supporting both would mean forking almost
>> everything removed by this series.
> 
> But on the other hand, BBAI64 and BeaglePlay only support GP and don't set any
> additional multiconfigs besides the main k3r5. I feel like creating a separate
> ti-sci-fw-bb.org with k3-image-gen might be possible. But I haven't tried that
> myself yet...
> 
> 
>> The benefit is not there IMHO since the beagle platforms should boot
>> almost exactly the same on our TI tree as the bb.org version.
>>
>> Moving forward, bb.org will also have to make this migration as
>> k3-image-gen will soon be deprecated. When they do, if we still want
>> their fork in meta-ti we can bring it back in.
> 
> The issue is that it will take time for bb.org to switch over to the latest TI
> 6.1 kernel and 2023 U-boot with binman. Moreover, they only support Debian, so
> don't expect timely OE recipe updates. And in all this potentially long time
> there won't be any OE support for BB platforms. But there are active OE BB
> users here and I'm trying to find a way to not throw them under the bus...
> 

This will only force them to use 2023 U-boot, which seems to boot the BB boards
just fine already. The kernel can remain 5.10 until bb.org upgrades.

Andrew
Denys Dmytriyenko May 6, 2023, 1:42 a.m. UTC | #5 
On Thu, May 04, 2023 at 09:00:22AM -0500, Andrew Davis wrote:
> On 5/2/23 2:38 PM, Denys Dmytriyenko wrote:
> >On Fri, Apr 28, 2023 at 10:13:26AM -0500, Andrew Davis wrote:
> >>On 4/27/23 3:31 PM, Denys Dmytriyenko wrote:
> >>>On Tue, Apr 25, 2023 at 12:23:40PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> >>>>This will no longer build after we switch away from k3-image-gen. Remove
> >>>>this version until it can be rebased on the latest U-Boot with binman
> >>>>support.
> >>>
> >>>>For now switch current users of this over to u-boot-ti v2021.01.
> >>>
> >>>This comment is not very clear - aren't you also removing that here?
> >>
> >>Not here, I do that in the *next* patch :)
> >>
> >>I usually sort my patches from least to most controversial, so the first
> >>3-4 can be taken stopping here without breaking as much.
> >>
> >>>Would it be possible to preserve at least Beagle build flows intact? Can
> >>>the existing ti-sci-fw recipe that uses k3-image-gen be kept for now
> >>>alongside the new one, e.g. move it to ti-sci-fw-legacy or something?
> >>
> >>I have found no such way :(
> >>
> >>All the multiconf and deploy logic expects k3-image-gen and now needs
> >>moved over to the new way. Supporting both would mean forking almost
> >>everything removed by this series.
> >
> >But on the other hand, BBAI64 and BeaglePlay only support GP and don't set any
> >additional multiconfigs besides the main k3r5. I feel like creating a separate
> >ti-sci-fw-bb.org with k3-image-gen might be possible. But I haven't tried that
> >myself yet...
> >
> >
> >>The benefit is not there IMHO since the beagle platforms should boot
> >>almost exactly the same on our TI tree as the bb.org version.
> >>
> >>Moving forward, bb.org will also have to make this migration as
> >>k3-image-gen will soon be deprecated. When they do, if we still want
> >>their fork in meta-ti we can bring it back in.
> >
> >The issue is that it will take time for bb.org to switch over to the latest TI
> >6.1 kernel and 2023 U-boot with binman. Moreover, they only support Debian, so
> >don't expect timely OE recipe updates. And in all this potentially long time
> >there won't be any OE support for BB platforms. But there are active OE BB
> >users here and I'm trying to find a way to not throw them under the bus...
> >
> 
> This will only force them to use 2023 U-boot, which seems to boot the BB boards
> just fine already. The kernel can remain 5.10 until bb.org upgrades.

Interesting. I would have to try this combination some time soon...
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
index fb52245b..be27705c 100644
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -5,8 +5,6 @@ 
 require conf/machine/include/am57xx.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
 
 KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
 
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
index 7c99b5d4..b893f380 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
@@ -4,9 +4,6 @@ 
 
 require conf/machine/include/k3r5.inc
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
-
 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index 304cbb62..bd5f541f 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -7,8 +7,6 @@  require conf/machine/include/j721e.inc
 UBOOT_MACHINE = "j721e_evm_a72_config"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
 
 KERNEL_DEVICETREE = " \
 ti/k3-j721e-beagleboneai64.dtb \
diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
index dceef1db..2d811d0d 100644
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -5,8 +5,6 @@ 
 require conf/machine/include/ti33x.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
 
 KERNEL_DEVICETREE_PREFIX = "am335x-bone"
 
diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
index c40615c9..f8f08d63 100644
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
@@ -4,9 +4,6 @@ 
 
 require conf/machine/include/k3r5.inc
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
-
 SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index e8d25cd9..f4f6a49c 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -20,8 +20,6 @@  OPTEEMACHINE = "k3-am62x"
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
 
 KERNEL_DEVICETREE = " \
 ti/k3-am625-beagleplay.dtb \
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
deleted file mode 100644
index 4e4688aa..00000000
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@ 
-require u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "beagle.*"
-
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
-
-PV = "2021.01"
-
-UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
-UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2021.01-ti-08.05.00.005-SDK-8.5"
-SRCREV = "46ff4982b41067e5c93369bddd49b1541856d80b"
-
-BRANCH:beaglebone-ai64 = "v2021.01-ti-08.05.00.001"
-BRANCH:beaglebone-ai64-k3r5 = "v2021.01-ti-08.05.00.001"
-SRCREV:beaglebone-ai64 = "ea96725b5156135d5875415f75d2188f6f56622a"
-SRCREV:beaglebone-ai64-k3r5 = "ea96725b5156135d5875415f75d2188f6f56622a"
-
-BRANCH:beagleplay = "v2021.01-ti-BeaglePlay-Release"
-BRANCH:beagleplay-k3r5 = "v2021.01-ti-BeaglePlay-Release"
-SRCREV:beagleplay = "f036fbdc25941d7585182d2552c767edb9b04114"
-SRCREV:beagleplay-k3r5 = "f036fbdc25941d7585182d2552c767edb9b04114"