[master][RFC PATCH 1/6] conf/machine: rename beagleplay machine to beagleplay-ti

[master][RFC PATCH 1/6] conf/machine: rename beagleplay machine to beagleplay-ti

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

BeaglePlay is officially supported by TI "ti-6_6" BSP and is part
of the TI-SDK releases. Switching BSP to BeagleBoard.org "bb_org"
settings for the same machine is possible within the same layer.

But having different machine configs for the same machine name in
multiple layers can be confusing and prone to errors. Hence rename
the config to indicate BeaglePlay with official TI support in order
to re-use the canonical name in a separate layer.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../machine/{beagleplay-k3r5.conf => beagleplay-ti-k3r5.conf}     | 0
 meta-ti-bsp/conf/machine/{beagleplay.conf => beagleplay-ti.conf}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-ti-bsp/conf/machine/{beagleplay-k3r5.conf => beagleplay-ti-k3r5.conf} (100%)
 rename meta-ti-bsp/conf/machine/{beagleplay.conf => beagleplay-ti.conf} (100%)

diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
similarity index 100%
rename from meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
rename to meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
similarity index 100%
rename from meta-ti-bsp/conf/machine/beagleplay.conf
rename to meta-ti-bsp/conf/machine/beagleplay-ti.conf
-- 
2.25.1

[master][RFC PATCH 2/6] meta-beagle: create a separate layer for Beagle platforms

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

The new meta-beagle will host all supported Beagle platforms that
use TI SoCs and hence need to depend on meta-ti-bsp. The default
BSP for the platforms in this layer will use BeagleBoard.org
official trees for the Linux kernel and U-boot.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-beagle/conf/layer.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-beagle/conf/layer.conf

diff --git a/meta-beagle/conf/layer.conf b/meta-beagle/conf/layer.conf
new file mode 100644
index 00000000..ca920f29
--- /dev/null
+++ b/meta-beagle/conf/layer.conf
@@ -0,0 +1,15 @@
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "meta-beagle"
+BBFILE_PATTERN_meta-beagle := "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-beagle = "6"
+
+LAYERSERIES_COMPAT_meta-beagle = "scarthgap styhead walnascar"
+
+LAYERDEPENDS_meta-bealge = " \
+    meta-ti-bsp \
+"
-- 
2.25.1

Re: [meta-ti] [master][RFC PATCH 2/6] meta-beagle: create a separate layer for Beagle platforms

[Ryan Eatmon]

On 11/5/2024 1:10 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> The new meta-beagle will host all supported Beagle platforms that
> use TI SoCs and hence need to depend on meta-ti-bsp. The default
> BSP for the platforms in this layer will use BeagleBoard.org
> official trees for the Linux kernel and U-boot.
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
>   meta-beagle/conf/layer.conf | 15 +++++++++++++++
>   1 file changed, 15 insertions(+)
>   create mode 100644 meta-beagle/conf/layer.conf
> 
> diff --git a/meta-beagle/conf/layer.conf b/meta-beagle/conf/layer.conf
> new file mode 100644
> index 00000000..ca920f29
> --- /dev/null
> +++ b/meta-beagle/conf/layer.conf
> @@ -0,0 +1,15 @@
> +# We have a conf and classes directory, append to BBPATH
> +BBPATH .= ":${LAYERDIR}"
> +
> +# We have a recipes directory, add to BBFILES
> +BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
> +
> +BBFILE_COLLECTIONS += "meta-beagle"
> +BBFILE_PATTERN_meta-beagle := "^${LAYERDIR}/"
> +BBFILE_PRIORITY_meta-beagle = "6"
> +
> +LAYERSERIES_COMPAT_meta-beagle = "scarthgap styhead walnascar"
> +
> +LAYERDEPENDS_meta-bealge = " \

misspelling------------^

> +    meta-ti-bsp \
> +"
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#18041): https://lists.yoctoproject.org/g/meta-ti/message/18041
> Mute This Topic: https://lists.yoctoproject.org/mt/109412224/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

Re: [meta-ti] [master][RFC PATCH 2/6] meta-beagle: create a separate layer for Beagle platforms

[Denys Dmytriyenko]

On Tue, Nov 05, 2024 at 02:24:40PM -0600, Ryan Eatmon wrote:
> 
> 
> On 11/5/2024 1:10 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >The new meta-beagle will host all supported Beagle platforms that
> >use TI SoCs and hence need to depend on meta-ti-bsp. The default
> >BSP for the platforms in this layer will use BeagleBoard.org
> >official trees for the Linux kernel and U-boot.
> >
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> >  meta-beagle/conf/layer.conf | 15 +++++++++++++++
> >  1 file changed, 15 insertions(+)
> >  create mode 100644 meta-beagle/conf/layer.conf
> >
> >diff --git a/meta-beagle/conf/layer.conf b/meta-beagle/conf/layer.conf
> >new file mode 100644
> >index 00000000..ca920f29
> >--- /dev/null
> >+++ b/meta-beagle/conf/layer.conf
> >@@ -0,0 +1,15 @@
> >+# We have a conf and classes directory, append to BBPATH
> >+BBPATH .= ":${LAYERDIR}"
> >+
> >+# We have a recipes directory, add to BBFILES
> >+BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
> >+
> >+BBFILE_COLLECTIONS += "meta-beagle"
> >+BBFILE_PATTERN_meta-beagle := "^${LAYERDIR}/"
> >+BBFILE_PRIORITY_meta-beagle = "6"
> >+
> >+LAYERSERIES_COMPAT_meta-beagle = "scarthgap styhead walnascar"
> >+
> >+LAYERDEPENDS_meta-bealge = " \
> 
> misspelling------------^

Indeed, thanks!


> >+    meta-ti-bsp \
> >+"

[master][RFC PATCH 3/6] conf/machine: move "bb_org" BSP settings to meta-beagle

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Define "bb_org" default BSP settings in meta-beagle layer that all Beagle
platforms will use.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../conf/machine/include/beagle-bsp.inc       | 24 +++++++++++++++++++
 meta-ti-bsp/conf/machine/include/ti-bsp.inc   | 21 +---------------
 2 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 meta-beagle/conf/machine/include/beagle-bsp.inc

diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc
new file mode 100644
index 00000000..77d0b483
--- /dev/null
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -0,0 +1,24 @@
+# Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile
+# with default preferences for Beagle platforms
+
+# Default is bb_org, but can override with any of the existing options
+TI_PREFERRED_BSP ?= "bb_org"
+
+# ==========
+# bb_org
+# BeagleBoard.org kernel 6.1, u-boot 2023.04
+# based on TI staging trees with extra Beagle-specific features
+# but may not be up-to-date with TI version
+# ==========
+BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org"
+BSP_KERNEL_VERSION:bsp-bb_org = "%"
+BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org"
+BSP_BOOTLOADER_VERSION:bsp-bb_org = "%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%"
+BSP_MESA_PVR_VERSION:bsp-bb_org = "22%"
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
index d27bbe3c..fcb7e2bc 100644
--- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
@@ -3,7 +3,7 @@
 # preferences for kernel, bootloader and graphics components, as
 # well as a dedicated machine override.
 
-# Supported options are: mainline, next, ti-6_6, ti-6_1, bb_org
+# Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1
 TI_PREFERRED_BSP ??= "ti-6_6"
 
 # Use bsp-* namespace for overrides
@@ -80,25 +80,6 @@ BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%"
 BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%"
 
-# ==========
-# bb_org
-# BeagleBoard.org kernel 6.1, u-boot 2023.04
-# based on TI staging trees with extra Beagle-specific features
-# but may not be up-to-date with TI version
-# ==========
-BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org"
-BSP_KERNEL_VERSION:bsp-bb_org = "%"
-BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org"
-BSP_BOOTLOADER_VERSION:bsp-bb_org = "%"
-
-BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%"
-BSP_MESA_PVR_VERSION:bsp-bb_org = "22%"
-
 # ==========
 # sane fallback defaults
 # if specific values are not defined or bsp is set incorrectly
-- 
2.25.1

[master][RFC PATCH 4/6] conf/machine: split beagleplay config between meta-ti-bsp and meta-beagle

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Extract "bb_org" BSP specific settings from beagleplay-ti in meta-ti-bsp and
move them to own beagleplay machine config in meta-beagle.

The differences between 2 configs are minimal, hence beagleplay in meta-beagle
inherits beagleplay-ti from meta-ti-bsp as a base and only adjusts what's
needed.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-beagle/conf/machine/beagleplay-k3r5.conf |  8 +++
 meta-beagle/conf/machine/beagleplay.conf      | 45 ++++++++++++++++
 .../conf/machine/beagleplay-ti-k3r5.conf      |  1 -
 meta-ti-bsp/conf/machine/beagleplay-ti.conf   | 51 +------------------
 4 files changed, 55 insertions(+), 50 deletions(-)
 create mode 100644 meta-beagle/conf/machine/beagleplay-k3r5.conf
 create mode 100644 meta-beagle/conf/machine/beagleplay.conf

diff --git a/meta-beagle/conf/machine/beagleplay-k3r5.conf b/meta-beagle/conf/machine/beagleplay-k3r5.conf
new file mode 100644
index 00000000..1423aa10
--- /dev/null
+++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: BeaglePlay (R5F)
+#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
+
+require conf/machine/beagleplay-ti-k3r5.conf
+require conf/machine/include/beagle-bsp.inc
+
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
diff --git a/meta-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf
new file mode 100644
index 00000000..1977b4c1
--- /dev/null
+++ b/meta-beagle/conf/machine/beagleplay.conf
@@ -0,0 +1,45 @@
+#@TYPE: Machine
+#@NAME: BeaglePlay (A53)
+#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
+
+require conf/machine/beagleplay-ti.conf
+require conf/machine/include/beagle-bsp.inc
+
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
+
+KERNEL_DEVICETREE:append:bsp-bb_org = " \
+ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-beaglemod.dtb \
+ti/k3-am625-beaglemod-audio.dtbo \
+ti/k3-am625-beaglemod-can0.dtbo \
+ti/k3-am625-beaglemod-can1.dtbo \
+ti/k3-am625-beaglemod-csi0-ov5640.dtbo \
+ti/k3-am625-beaglemod-eeprom.dtbo \
+ti/k3-am625-beaglemod-eth.dtbo \
+ti/k3-am625-beaglemod-hdmi.dtbo \
+ti/k3-am625-beaglemod-io-expand.dtbo \
+ti/k3-am625-beaglemod-lt-lcd185.dtbo \
+ti/k3-am625-beaglemod-ospi-flash.dtbo \
+ti/k3-am625-beaglemod-rs485-1.dtbo \
+ti/k3-am625-beaglemod-rs485-2.dtbo \
+ti/k3-am625-beaglemod-rtc.dtbo \
+ti/k3-am625-beaglemod-wl1835.dtbo \
+ti/k3-am625-sk-dmtimer-pwm.dtbo \
+ti/k3-am625-sk-ecap-capture.dtbo \
+ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-sk-mcspi-loopback.dtbo \
+ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
+ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
+ti/k3-am625-sk-pwm.dtbo \
+ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
+ti/k3-am62x-sk-csi2-imx219.dtbo \
+ti/k3-am62x-sk-csi2-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
+ti/k3-am62x-sk-eqep.dtbo \
+ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \
+ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
+ti/k3-am62x-sk-mcan.dtbo \
+"
diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
index 3844ccfa..c27e0abc 100644
--- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
@@ -12,6 +12,5 @@ UBOOT_MACHINE = "am62x_evm_r5_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig"
 UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig"
 
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
 UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
 UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"
diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
index 3ae10171..68d6dced 100644
--- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
@@ -24,14 +24,14 @@ UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig"
 UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig"
 
 UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
 UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_a53.config"
 
 SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
 SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
 
 KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am625 \
+    ti/k3-am625-beagle \
+    ti/k3-am625-sk \
     ti/k3-am62x-sk \
 "
 
@@ -39,58 +39,11 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
     ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
     ti/k3-am625-beagleplay.dtb \
-    ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo \
-    ti/k3-am625-phyboard-lyra-rdk.dtb \
     ti/k3-am625-sk.dtb \
-    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
-    ti/k3-am625-verdin-nonwifi-dev.dtb \
-    ti/k3-am625-verdin-nonwifi-mallow.dtb \
-    ti/k3-am625-verdin-nonwifi-yavia.dtb \
-    ti/k3-am625-verdin-wifi-dahlia.dtb \
-    ti/k3-am625-verdin-wifi-dev.dtb \
-    ti/k3-am625-verdin-wifi-mallow.dtb \
-    ti/k3-am625-verdin-wifi-yavia.dtb \
     ti/k3-am62x-sk-csi2-imx219.dtbo \
     ti/k3-am62x-sk-csi2-ov5640.dtbo \
     ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-KERNEL_DEVICETREE:append:bsp-bb_org = " \
-ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-beaglemod.dtb \
-ti/k3-am625-beaglemod-audio.dtbo \
-ti/k3-am625-beaglemod-can0.dtbo \
-ti/k3-am625-beaglemod-can1.dtbo \
-ti/k3-am625-beaglemod-csi0-ov5640.dtbo \
-ti/k3-am625-beaglemod-eeprom.dtbo \
-ti/k3-am625-beaglemod-eth.dtbo \
-ti/k3-am625-beaglemod-hdmi.dtbo \
-ti/k3-am625-beaglemod-io-expand.dtbo \
-ti/k3-am625-beaglemod-lt-lcd185.dtbo \
-ti/k3-am625-beaglemod-ospi-flash.dtbo \
-ti/k3-am625-beaglemod-rs485-1.dtbo \
-ti/k3-am625-beaglemod-rs485-2.dtbo \
-ti/k3-am625-beaglemod-rtc.dtbo \
-ti/k3-am625-beaglemod-wl1835.dtbo \
-ti/k3-am625-sk-dmtimer-pwm.dtbo \
-ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk-mcspi-loopback.dtbo \
-ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
-ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
-ti/k3-am625-sk-pwm.dtbo \
-ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
-ti/k3-am62x-sk-csi2-imx219.dtbo \
-ti/k3-am62x-sk-csi2-ov5640.dtbo \
-ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
-ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
-ti/k3-am62x-sk-eqep.dtbo \
-ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \
-ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
-ti/k3-am62x-sk-mcan.dtbo \
-"
-
 MACHINE_GUI_CLASS = "bigscreen"
-- 
2.25.1

[master][RFC PATCH 5/6] conf/machine: move remaining Beagle platforms to meta-beagle

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Include beagle-bsp.inc to define "bb_org" BSP settings and select that
as a default.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 {meta-ti-bsp => meta-beagle}/conf/machine/beagle-x15.conf      | 3 +--
 .../conf/machine/beaglebone-ai64-k3r5.conf                     | 3 +--
 {meta-ti-bsp => meta-beagle}/conf/machine/beaglebone-ai64.conf | 3 +--
 {meta-ti-bsp => meta-beagle}/conf/machine/beaglebone.conf      | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)
 rename {meta-ti-bsp => meta-beagle}/conf/machine/beagle-x15.conf (94%)
 rename {meta-ti-bsp => meta-beagle}/conf/machine/beaglebone-ai64-k3r5.conf (94%)
 rename {meta-ti-bsp => meta-beagle}/conf/machine/beaglebone-ai64.conf (96%)
 rename {meta-ti-bsp => meta-beagle}/conf/machine/beaglebone.conf (95%)

diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-beagle/conf/machine/beagle-x15.conf
similarity index 94%
rename from meta-ti-bsp/conf/machine/beagle-x15.conf
rename to meta-beagle/conf/machine/beagle-x15.conf
index 6f8c435b..e9ab5d40 100644
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-beagle/conf/machine/beagle-x15.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBoard X15
 #@DESCRIPTION: Machine configuration for the BeagleBoard X15
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/am57xx.inc
+require conf/machine/include/beagle-bsp.inc
 
 DT_VENDOR_PREFIX = "ti/omap/"
 DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
similarity index 94%
rename from meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
rename to meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
index d415a212..95d3abc0 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBone AI-64 (R5F)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core)
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/k3r5.inc
+require conf/machine/include/beagle-bsp.inc
 
 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf
similarity index 96%
rename from meta-ti-bsp/conf/machine/beaglebone-ai64.conf
rename to meta-beagle/conf/machine/beaglebone-ai64.conf
index 56e1ed4e..faffd0bb 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBone AI-64 (A72)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/j721e.inc
+require conf/machine/include/beagle-bsp.inc
 
 IMAGE_SR1_1_HS_FS_FILES:bsp-bb_org = ""
 IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""
diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-beagle/conf/machine/beaglebone.conf
similarity index 95%
rename from meta-ti-bsp/conf/machine/beaglebone.conf
rename to meta-beagle/conf/machine/beaglebone.conf
index 0db4d304..6048383b 100644
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-beagle/conf/machine/beaglebone.conf
@@ -2,9 +2,8 @@
 #@NAME: BeagleBone machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
 
-TI_PREFERRED_BSP ?= "bb_org"
-
 require conf/machine/include/ti33x.inc
+require conf/machine/include/beagle-bsp.inc
 
 DT_VENDOR_PREFIX = "ti/omap/"
 DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
-- 
2.25.1

[master][RFC PATCH 6/6] u-boot-bb_org, linux-bb_org: move "bb_org" providers to meta-beagle

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Move "bb_org" kernel and U-boot providers that use corresponding official
BeagleBoard.org trees into own meta-beagle layer.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-bsp/u-boot/u-boot-bb.org_git.bb                     | 2 +-
 .../0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch | 0
 ...1-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch | 0
 .../recipes-kernel/linux/linux-bb.org/defconfig                 | 0
 .../recipes-kernel/linux/linux-bb.org_git.bb                    | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename {meta-ti-bsp => meta-beagle}/recipes-bsp/u-boot/u-boot-bb.org_git.bb (92%)
 rename {meta-ti-bsp => meta-beagle}/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch (100%)
 rename {meta-ti-bsp => meta-beagle}/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch (100%)
 rename {meta-ti-bsp => meta-beagle}/recipes-kernel/linux/linux-bb.org/defconfig (100%)
 rename {meta-ti-bsp => meta-beagle}/recipes-kernel/linux/linux-bb.org_git.bb (100%)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb
similarity index 92%
rename from meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
rename to meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb
index 13286564..0b23effc 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb
@@ -1,4 +1,4 @@
-require u-boot-ti.inc
+require recipes-bsp/u-boot/u-boot-ti.inc
 
 SUMMARY = "BeagleBoard.org U-Boot"
 
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch b/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
similarity index 100%
rename from meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
rename to meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch b/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch
similarity index 100%
rename from meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch
rename to meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig
similarity index 100%
rename from meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig
rename to meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb
similarity index 100%
rename from meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
rename to meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb
-- 
2.25.1

Re: [meta-ti] [master][RFC PATCH 1/6] conf/machine: rename beagleplay machine to beagleplay-ti

[Chirag Shilwant]

Hi Denys,

On 06/11/24 00:40, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ konsulko. com> BeaglePlay is 
> officially supported by TI "ti-6_6" BSP and is part of the TI-SDK 
> releases. Switching BSP to BeagleBoard. org "bb_org" settings for the 
> same machine is possible within the same
> ZjQcmQRYFpfptBannerStart
> Report Suspicious
> <https://us-phishalarm-ewt.proofpoint.com/EWT/v1/G3vK!uZdqXRfP9k07KqZFHPOj3DFYN5-MCGhQRn4XVQxYA21XJhOdaXkP5hLhMcH5N1PhQXx_-P68NVrtl3ufBrA_ew$> 
>
> ZjQcmQRYFpfptBannerEnd
> From: Denys Dmytriyenko <denys@konsulko.com>
>
> BeaglePlay is officially supported by TI "ti-6_6" BSP and is part
> of the TI-SDK releases. Switching BSP to BeagleBoard.org "bb_org"
> settings for the same machine is possible within the same layer.
>
> But having different machine configs for the same machine name in
> multiple layers can be confusing and prone to errors. Hence rename
> the config to indicate BeaglePlay with official TI support in order
> to re-use the canonical name in a separate layer.



Apart from [1], in general the entire series looks good to me!


[1]- https://lists.yoctoproject.org/g/meta-ti/message/18047



>
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---



Reviewed-by: Chirag Shilwant <c-shilwant@ti.com>



>   .../machine/{beagleplay-k3r5.conf => beagleplay-ti-k3r5.conf}     | 0
>   meta-ti-bsp/conf/machine/{beagleplay.conf => beagleplay-ti.conf}  | 0
>   2 files changed, 0 insertions(+), 0 deletions(-)
>   rename meta-ti-bsp/conf/machine/{beagleplay-k3r5.conf => beagleplay-ti-k3r5.conf} (100%)
>   rename meta-ti-bsp/conf/machine/{beagleplay.conf => beagleplay-ti.conf} (100%)
>
> diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
> similarity index 100%
> rename from meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
> rename to meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
> similarity index 100%
> rename from meta-ti-bsp/conf/machine/beagleplay.conf
> rename to meta-ti-bsp/conf/machine/beagleplay-ti.conf
> -- 
> 2.25.1