diff mbox series

[master,5/6] beagley-ai: upgrade BeagleY-AI to 6.12

Message ID 20250517005430.3648211-5-denis@denix.org
State Under Review
Delegated to: Ryan Eatmon
Headers show
Series [master,1/6] linux-bb.org: bump to the latest 6.6 | expand

Commit Message

Denys Dmytriyenko May 17, 2025, 12:54 a.m. UTC
From: Denys Dmytriyenko <denys@konsulko.com>

Upgrade BeagleY-AI platform to 6.12 BSP.

U-boot support for this platform is still in its own branch.

Also adjust U-boot bootcmd, as Distro Boot doesn't fully work yet.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-beagle/conf/machine/beagley-ai-k3r5.conf             | 3 +--
 meta-beagle/conf/machine/beagley-ai.conf                  | 8 ++++++--
 .../u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg   | 1 +
 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb   | 7 +++++++
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg

Comments

Andrew Davis May 19, 2025, 5:22 p.m. UTC | #1
On 5/16/25 7:54 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> Upgrade BeagleY-AI platform to 6.12 BSP.
> 
> U-boot support for this platform is still in its own branch.
> 
> Also adjust U-boot bootcmd, as Distro Boot doesn't fully work yet.
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
>   meta-beagle/conf/machine/beagley-ai-k3r5.conf             | 3 +--
>   meta-beagle/conf/machine/beagley-ai.conf                  | 8 ++++++--
>   .../u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg   | 1 +
>   meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb   | 7 +++++++
>   4 files changed, 15 insertions(+), 4 deletions(-)
>   create mode 100644 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
> 
> diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> index 6cc370d1..8d5111f0 100644
> --- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> +++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> @@ -3,8 +3,6 @@
>   #@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
>   
>   require conf/machine/include/k3r5.inc
> -
> -TI_PREFERRED_BSP ?= "bb_org-6_1"
>   require conf/machine/include/beagle-bsp.inc
>   
>   SYSFW_SOC = "j722s"
> @@ -12,5 +10,6 @@ SYSFW_CONFIG = "evm"
>   SYSFW_SUFFIX = "hs-fs"
>   
>   UBOOT_MACHINE = "j722s_evm_r5_defconfig"
> +UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
>   
>   UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
> diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf
> index 9b1832d2..497001ee 100644
> --- a/meta-beagle/conf/machine/beagley-ai.conf
> +++ b/meta-beagle/conf/machine/beagley-ai.conf
> @@ -3,11 +3,10 @@
>   #@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
>   
>   require conf/machine/include/j722s.inc
> -
> -TI_PREFERRED_BSP ?= "bb_org-6_1"
>   require conf/machine/include/beagle-bsp.inc
>   
>   UBOOT_MACHINE = "j722s_evm_a53_config"
> +UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig"
>   
>   UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config"
>   
> @@ -22,4 +21,9 @@ ti/k3-j722s-evm.dtb \
>   ti/k3-am67a-beagley-ai.dtb \
>   "
>   
> +KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
> +ti/k3-j722s-evm.dtb \
> +ti/k3-am67a-beagley-ai.dtb \
> +"
> +
>   MACHINE_GUI_CLASS = "bigscreen"
> diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
> new file mode 100644
> index 00000000..362696b9
> --- /dev/null
> +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
> @@ -0,0 +1 @@
> +CONFIG_BOOTCOMMAND="run bootcmd_ti_mmc"
> diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
> index 492705c2..9fc4015e 100644
> --- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
> +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
> @@ -10,3 +10,10 @@ UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
>   UBOOT_GIT_PROTOCOL = "https"
>   BRANCH = "v2025.04-Beagle"
>   SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
> +
> +BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"

BeagleY-AI support is now in the latest upstream master. This branch here
is missing some updates for BeagleY-AI that can be found in master.

Would it be better here to take the v2025.07-rc1-Beagle here which
includes both these additional BeagleY-AI patches and also PB2 support?
Maybe it should be the default then.

Andrew

[0] $ git log --oneline 5a0a93a7684..9f5f9965960

> +BRANCH:beagley-ai-k3r5 = "v2025.04-rc3-BeagleY-AI"
> +SRCREV:beagley-ai = "cc376f9faef201670c7bb1734f42f5475c73f85d"
> +SRCREV:beagley-ai-k3r5 = "cc376f9faef201670c7bb1734f42f5475c73f85d"
> +
> +SRC_URI:append:beagley-ai = " file://bootcmd-ti-mmc.cfg"
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#18567): https://lists.yoctoproject.org/g/meta-ti/message/18567
> Mute This Topic: https://lists.yoctoproject.org/mt/113155503/3619733
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Denys Dmytriyenko May 19, 2025, 5:52 p.m. UTC | #2
On Mon, May 19, 2025 at 12:22:08PM -0500, Andrew Davis wrote:
> On 5/16/25 7:54 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >Upgrade BeagleY-AI platform to 6.12 BSP.
> >
> >U-boot support for this platform is still in its own branch.
> >
> >Also adjust U-boot bootcmd, as Distro Boot doesn't fully work yet.
> >
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> >  meta-beagle/conf/machine/beagley-ai-k3r5.conf             | 3 +--
> >  meta-beagle/conf/machine/beagley-ai.conf                  | 8 ++++++--
> >  .../u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg   | 1 +
> >  meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb   | 7 +++++++
> >  4 files changed, 15 insertions(+), 4 deletions(-)
> >  create mode 100644 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
> >
> >diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> >index 6cc370d1..8d5111f0 100644
> >--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> >+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
> >@@ -3,8 +3,6 @@
> >  #@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
> >  require conf/machine/include/k3r5.inc
> >-
> >-TI_PREFERRED_BSP ?= "bb_org-6_1"
> >  require conf/machine/include/beagle-bsp.inc
> >  SYSFW_SOC = "j722s"
> >@@ -12,5 +10,6 @@ SYSFW_CONFIG = "evm"
> >  SYSFW_SUFFIX = "hs-fs"
> >  UBOOT_MACHINE = "j722s_evm_r5_defconfig"
> >+UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
> >  UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
> >diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf
> >index 9b1832d2..497001ee 100644
> >--- a/meta-beagle/conf/machine/beagley-ai.conf
> >+++ b/meta-beagle/conf/machine/beagley-ai.conf
> >@@ -3,11 +3,10 @@
> >  #@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
> >  require conf/machine/include/j722s.inc
> >-
> >-TI_PREFERRED_BSP ?= "bb_org-6_1"
> >  require conf/machine/include/beagle-bsp.inc
> >  UBOOT_MACHINE = "j722s_evm_a53_config"
> >+UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig"
> >  UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config"
> >@@ -22,4 +21,9 @@ ti/k3-j722s-evm.dtb \
> >  ti/k3-am67a-beagley-ai.dtb \
> >  "
> >+KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
> >+ti/k3-j722s-evm.dtb \
> >+ti/k3-am67a-beagley-ai.dtb \
> >+"
> >+
> >  MACHINE_GUI_CLASS = "bigscreen"
> >diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
> >new file mode 100644
> >index 00000000..362696b9
> >--- /dev/null
> >+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
> >@@ -0,0 +1 @@
> >+CONFIG_BOOTCOMMAND="run bootcmd_ti_mmc"
> >diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
> >index 492705c2..9fc4015e 100644
> >--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
> >+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
> >@@ -10,3 +10,10 @@ UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
> >  UBOOT_GIT_PROTOCOL = "https"
> >  BRANCH = "v2025.04-Beagle"
> >  SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
> >+
> >+BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
> 
> BeagleY-AI support is now in the latest upstream master. This branch here
> is missing some updates for BeagleY-AI that can be found in master.
> 
> Would it be better here to take the v2025.07-rc1-Beagle here which
> includes both these additional BeagleY-AI patches and also PB2 support?
> Maybe it should be the default then.

I'd be fine switching to 2025.07 eventually, once it matures a bit - I'm not 
comfortable taking rc1 at this point.

We can do this in stages - now update 6.1 -> 6.12 with 2025.04 in a seaprate 
branch, then update 2025.04 -> 2025.07 when it's ready (either final or at 
least rc3/rc4).


> Andrew
> 
> [0] $ git log --oneline 5a0a93a7684..9f5f9965960
> 
> >+BRANCH:beagley-ai-k3r5 = "v2025.04-rc3-BeagleY-AI"
> >+SRCREV:beagley-ai = "cc376f9faef201670c7bb1734f42f5475c73f85d"
> >+SRCREV:beagley-ai-k3r5 = "cc376f9faef201670c7bb1734f42f5475c73f85d"
> >+
> >+SRC_URI:append:beagley-ai = " file://bootcmd-ti-mmc.cfg"
Robert Nelson May 23, 2025, 10:30 p.m. UTC | #3
> > >@@ -10,3 +10,10 @@ UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
> > >  UBOOT_GIT_PROTOCOL = "https"
> > >  BRANCH = "v2025.04-Beagle"
> > >  SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
> > >+
> > >+BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"

Ugh... this was a build test of Andrew's patchset!

> >
> > BeagleY-AI support is now in the latest upstream master. This branch here
> > is missing some updates for BeagleY-AI that can be found in master.
> >
> > Would it be better here to take the v2025.07-rc1-Beagle here which
> > includes both these additional BeagleY-AI patches and also PB2 support?
> > Maybe it should be the default then.
>
> I'd be fine switching to 2025.07 eventually, once it matures a bit - I'm not
> comfortable taking rc1 at this point.
>
> We can do this in stages - now update 6.1 -> 6.12 with 2025.04 in a seaprate
> branch, then update 2025.04 -> 2025.07 when it's ready (either final or at
> least rc3/rc4).

https://github.com/beagleboard/u-boot/tree/v2025.07-rc2-Beagle

Tested on 5 BeagleY-AI's, 3 running pcie nvme root's, 2 normal
microSD, v6.1.x-ti, v6.6.x-ti kernels.. (dropped in over the shipping
2023.xx u-boot)

TI_FIRMWARE="11.00.14"
TRUSTED_FIRMWARE="lts-v2.12.3"
OPTEE="4.6.0"
UBOOT="v2025.07-rc2-Beagle"

https://openbeagle.org/beagley-ai/u-boot-beagley-ai/-/blob/main/build_u-boot.sh?ref_type=heads

Regards,
Robert Nelson May 23, 2025, 10:32 p.m. UTC | #4
On Fri, May 23, 2025 at 5:30 PM Robert Nelson <robertcnelson@gmail.com> wrote:
>
> > > >@@ -10,3 +10,10 @@ UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
> > > >  UBOOT_GIT_PROTOCOL = "https"
> > > >  BRANCH = "v2025.04-Beagle"
> > > >  SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
> > > >+
> > > >+BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
>
> Ugh... this was a build test of Andrew's patchset!
>
> > >
> > > BeagleY-AI support is now in the latest upstream master. This branch here
> > > is missing some updates for BeagleY-AI that can be found in master.
> > >
> > > Would it be better here to take the v2025.07-rc1-Beagle here which
> > > includes both these additional BeagleY-AI patches and also PB2 support?
> > > Maybe it should be the default then.
> >
> > I'd be fine switching to 2025.07 eventually, once it matures a bit - I'm not
> > comfortable taking rc1 at this point.
> >
> > We can do this in stages - now update 6.1 -> 6.12 with 2025.04 in a seaprate
> > branch, then update 2025.04 -> 2025.07 when it's ready (either final or at
> > least rc3/rc4).
>
> https://github.com/beagleboard/u-boot/tree/v2025.07-rc2-Beagle

I also tested on 2 BeaglePlay's and 2 BBAI-64's.. so i've moved
BeagleY-AI, BeaglePlay and BBAI-64 to v2025.07-rc2..

I'll hack on PB2 over the weekend, that's going to take more of a
cleanup for am6232- -> am62 changes..

Regards,
Denys Dmytriyenko May 23, 2025, 11:38 p.m. UTC | #5
On Fri, May 23, 2025 at 05:32:14PM -0500, Robert Nelson wrote:
> On Fri, May 23, 2025 at 5:30 PM Robert Nelson <robertcnelson@gmail.com> wrote:
> >
> > > > >@@ -10,3 +10,10 @@ UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
> > > > >  UBOOT_GIT_PROTOCOL = "https"
> > > > >  BRANCH = "v2025.04-Beagle"
> > > > >  SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
> > > > >+
> > > > >+BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
> >
> > Ugh... this was a build test of Andrew's patchset!
> >
> > > >
> > > > BeagleY-AI support is now in the latest upstream master. This branch here
> > > > is missing some updates for BeagleY-AI that can be found in master.
> > > >
> > > > Would it be better here to take the v2025.07-rc1-Beagle here which
> > > > includes both these additional BeagleY-AI patches and also PB2 support?
> > > > Maybe it should be the default then.
> > >
> > > I'd be fine switching to 2025.07 eventually, once it matures a bit - I'm not
> > > comfortable taking rc1 at this point.
> > >
> > > We can do this in stages - now update 6.1 -> 6.12 with 2025.04 in a seaprate
> > > branch, then update 2025.04 -> 2025.07 when it's ready (either final or at
> > > least rc3/rc4).
> >
> > https://github.com/beagleboard/u-boot/tree/v2025.07-rc2-Beagle
> 
> I also tested on 2 BeaglePlay's and 2 BBAI-64's.. so i've moved
> BeagleY-AI, BeaglePlay and BBAI-64 to v2025.07-rc2..
> 
> I'll hack on PB2 over the weekend, that's going to take more of a
> cleanup for am6232- -> am62 changes..

Sounds good! I believe this series for meta-ti is ready to be merged, as it's 
been in different stages of testing for quite some time, plus the backlog of 
pending commits is quite long as it is now. After that we'll be able to do a 
quick U-boot update to 2025.07 in a couple of weeks, once you push your 
branches and I do quick testing. Ah, and that means I'll need to get myself 
a new PB2 A1...
Robert Nelson May 24, 2025, 12:12 a.m. UTC | #6
Send me a pm with your shipping address, I'll get one routed from work

On Fri, May 23, 2025, 6:38 PM Denys Dmytriyenko via lists.yoctoproject.org
<denis=denix.org@lists.yoctoproject.org> wrote:

> On Fri, May 23, 2025 at 05:32:14PM -0500, Robert Nelson wrote:
> > On Fri, May 23, 2025 at 5:30 PM Robert Nelson <robertcnelson@gmail.com>
> wrote:
> > >
> > > > > >@@ -10,3 +10,10 @@ UBOOT_GIT_URI = "git://
> github.com/beagleboard/u-boot.git"
> > > > > >  UBOOT_GIT_PROTOCOL = "https"
> > > > > >  BRANCH = "v2025.04-Beagle"
> > > > > >  SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
> > > > > >+
> > > > > >+BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
> > >
> > > Ugh... this was a build test of Andrew's patchset!
> > >
> > > > >
> > > > > BeagleY-AI support is now in the latest upstream master. This
> branch here
> > > > > is missing some updates for BeagleY-AI that can be found in master.
> > > > >
> > > > > Would it be better here to take the v2025.07-rc1-Beagle here which
> > > > > includes both these additional BeagleY-AI patches and also PB2
> support?
> > > > > Maybe it should be the default then.
> > > >
> > > > I'd be fine switching to 2025.07 eventually, once it matures a bit -
> I'm not
> > > > comfortable taking rc1 at this point.
> > > >
> > > > We can do this in stages - now update 6.1 -> 6.12 with 2025.04 in a
> seaprate
> > > > branch, then update 2025.04 -> 2025.07 when it's ready (either final
> or at
> > > > least rc3/rc4).
> > >
> > > https://github.com/beagleboard/u-boot/tree/v2025.07-rc2-Beagle
> >
> > I also tested on 2 BeaglePlay's and 2 BBAI-64's.. so i've moved
> > BeagleY-AI, BeaglePlay and BBAI-64 to v2025.07-rc2..
> >
> > I'll hack on PB2 over the weekend, that's going to take more of a
> > cleanup for am6232- -> am62 changes..
>
> Sounds good! I believe this series for meta-ti is ready to be merged, as
> it's
> been in different stages of testing for quite some time, plus the backlog
> of
> pending commits is quite long as it is now. After that we'll be able to do
> a
> quick U-boot update to 2025.07 in a couple of weeks, once you push your
> branches and I do quick testing. Ah, and that means I'll need to get
> myself
> a new PB2 A1...
>
> --
> Denys
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#18598):
> https://lists.yoctoproject.org/g/meta-ti/message/18598
> Mute This Topic: https://lists.yoctoproject.org/mt/113155503/3619810
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [
> robertcnelson@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
diff mbox series

Patch

diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
index 6cc370d1..8d5111f0 100644
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -3,8 +3,6 @@ 
 #@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
 
 require conf/machine/include/k3r5.inc
-
-TI_PREFERRED_BSP ?= "bb_org-6_1"
 require conf/machine/include/beagle-bsp.inc
 
 SYSFW_SOC = "j722s"
@@ -12,5 +10,6 @@  SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "j722s_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
 
 UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf
index 9b1832d2..497001ee 100644
--- a/meta-beagle/conf/machine/beagley-ai.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -3,11 +3,10 @@ 
 #@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
 
 require conf/machine/include/j722s.inc
-
-TI_PREFERRED_BSP ?= "bb_org-6_1"
 require conf/machine/include/beagle-bsp.inc
 
 UBOOT_MACHINE = "j722s_evm_a53_config"
+UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig"
 
 UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config"
 
@@ -22,4 +21,9 @@  ti/k3-j722s-evm.dtb \
 ti/k3-am67a-beagley-ai.dtb \
 "
 
+KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
+ti/k3-j722s-evm.dtb \
+ti/k3-am67a-beagley-ai.dtb \
+"
+
 MACHINE_GUI_CLASS = "bigscreen"
diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
new file mode 100644
index 00000000..362696b9
--- /dev/null
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
@@ -0,0 +1 @@ 
+CONFIG_BOOTCOMMAND="run bootcmd_ti_mmc"
diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
index 492705c2..9fc4015e 100644
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
@@ -10,3 +10,10 @@  UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
 BRANCH = "v2025.04-Beagle"
 SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
+
+BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
+BRANCH:beagley-ai-k3r5 = "v2025.04-rc3-BeagleY-AI"
+SRCREV:beagley-ai = "cc376f9faef201670c7bb1734f42f5475c73f85d"
+SRCREV:beagley-ai-k3r5 = "cc376f9faef201670c7bb1734f42f5475c73f85d"
+
+SRC_URI:append:beagley-ai = " file://bootcmd-ti-mmc.cfg"