diff mbox series

[meta-ti,master/wrynose] meta-beagle: Fix BeagleBadge build

Message ID 20260629215512.88924-1-jm@ti.com
State New
Headers show
Series [meta-ti,master/wrynose] meta-beagle: Fix BeagleBadge build | expand

Commit Message

Judith Mendez June 29, 2026, 9:55 p.m. UTC
Fix BeagleBadge DT which is now k3-am62l3-beaglebadge and u-boot
build name which was updated alongside DT name change.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 meta-beagle/conf/machine/beaglebadge-ti.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

PRC Automation June 29, 2026, 10 p.m. UTC | #1
meta-ti / na / 20260629215512.88924-1-jm

PRC Results: FAIL

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [meta-ti][master/wrynose][PATCH] meta-beagle: Fix BeagleBadge build
    WARN: Commit message does not include file/recipe name: meta-beagle: Fix BeagleBadge build. (COMMIT-MESSAGE-2)
        patch
    
    WARN: Commit message should not include directory path to recipe: meta-beagle: Fix BeagleBadge build.
              meta-beagle (COMMIT-MESSAGE-3)
        patch
    
    For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887



=========================================================
  apply-yocto-patch: FAIL
=========================================================
master
=====================
Summary:
- Patch Series: [meta-ti][master/wrynose][PATCH] meta-beagle: Fix BeagleBadge build
- Submitter: From: Judith Mendez <jm@ti.com>
- Date: Date: Mon, 29 Jun 2026 16:55:12 -0500
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: 617a17e5c6cd1d08290046446bb61cbcb214037c

Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master
- Commit Author: LCPD Automation Script <lcpdbld@list.ti.com>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202606162200
- Commit SHA: 8b9b4854295491a0272722fe4fb2e0aa773d0a6d

Patches
----------------------------------------
All patches applied

wrynose
=====================
Summary:
- Patch Series: [meta-ti][master/wrynose][PATCH] meta-beagle: Fix BeagleBadge build
- Submitter: From: Judith Mendez <jm@ti.com>
- Date: Date: Mon, 29 Jun 2026 16:55:12 -0500
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: 617a17e5c6cd1d08290046446bb61cbcb214037c

Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: wrynose
- Commit Author: LCPD Automation Script <lcpdbld@list.ti.com>
- Commit Subject: CI/CD Auto-Merger: cicd.wrynose.202606241800
- Commit SHA: 937a0b45728e16c279a7dad65585da061526936a

Patches
----------------------------------------
FAIL - [meta-ti][master/wrynose][PATCH] meta-beagle: Fix BeagleBadge build
    error: patch failed: meta-beagle/conf/machine/beaglebadge-ti.conf:11
    error: meta-beagle/conf/machine/beaglebadge-ti.conf: patch does not apply
    Applying: meta-beagle: Fix BeagleBadge build
    Patch failed at 0001 meta-beagle: Fix BeagleBadge build
Ryan Eatmon June 29, 2026, 10:25 p.m. UTC | #2
NAK.

You are doing this a global level and not taking into account the BSP 
system.  You need to classify the setting for these variables using 
existing bsp overrides:

KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62l3-badge \
"

KERNEL_DEVICETREE_PREFIX:bsp-ti-6_18 = " \
     ti/k3-am62l3-beaglebadge \
"

UBOOT_MACHINE = "am62lx_badge_defconfig"
UBOOT_MACHINE:bsp-ti-6_18 = "am62lx_beaglebadge_defconfig"


At some point in the future we can flip the default and the override to 
be the older one, but that usually comes when next/mainline/current all 
agree.


On 6/29/2026 4:55 PM, Judith Mendez wrote:
> Fix BeagleBadge DT which is now k3-am62l3-beaglebadge and u-boot
> build name which was updated alongside DT name change.
> 
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
>   meta-beagle/conf/machine/beaglebadge-ti.conf | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-beagle/conf/machine/beaglebadge-ti.conf b/meta-beagle/conf/machine/beaglebadge-ti.conf
> index 78525030..c29031eb 100644
> --- a/meta-beagle/conf/machine/beaglebadge-ti.conf
> +++ b/meta-beagle/conf/machine/beaglebadge-ti.conf
> @@ -11,11 +11,11 @@ MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
>   UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
>   
>   KERNEL_DEVICETREE_PREFIX = " \
> -    ti/k3-am62l3-badge \
> +    ti/k3-am62l3-beaglebadge \
>   "
>   
>   KERNEL_DEVICETREE = ""
>   
> -UBOOT_MACHINE = "am62lx_badge_defconfig"
> +UBOOT_MACHINE = "am62lx_beaglebadge_defconfig"
>   
>   TFA_BOARD = "am62l3-badge"
diff mbox series

Patch

diff --git a/meta-beagle/conf/machine/beaglebadge-ti.conf b/meta-beagle/conf/machine/beaglebadge-ti.conf
index 78525030..c29031eb 100644
--- a/meta-beagle/conf/machine/beaglebadge-ti.conf
+++ b/meta-beagle/conf/machine/beaglebadge-ti.conf
@@ -11,11 +11,11 @@  MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
 UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
 
 KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62l3-badge \
+    ti/k3-am62l3-beaglebadge \
 "
 
 KERNEL_DEVICETREE = ""
 
-UBOOT_MACHINE = "am62lx_badge_defconfig"
+UBOOT_MACHINE = "am62lx_beaglebadge_defconfig"
 
 TFA_BOARD = "am62l3-badge"