From 7e91b432b9ce5212b3b5a54036e0d59c1edc79c1 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 16 May 2025 20:54:29 -0400 Subject: beagley-ai: upgrade BeagleY-AI to 6.12 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 Signed-off-by: Ryan Eatmon --- 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" +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" -- cgit v1.2.3-54-g00ecf