From patchwork Tue Nov 5 19:10:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 51959 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 016C3D3611A for ; Tue, 5 Nov 2024 19:11:28 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.28725.1730833879423674001 for ; Tue, 05 Nov 2024 11:11:20 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 5238A40CDF; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t9MrB1Y8RH78; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 3CCB940C16; Tue, 5 Nov 2024 19:11:17 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 5D4AF1640B6; Tue, 5 Nov 2024 14:11:16 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 1/6] conf/machine: rename beagleplay machine to beagleplay-ti Date: Tue, 5 Nov 2024 14:10:55 -0500 Message-Id: <20241105191100.532413-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Nov 2024 19:11:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18045 From: Denys Dmytriyenko 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 Reviewed-by: Chirag Shilwant --- .../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 From patchwork Tue Nov 5 19:10:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 51960 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6FEAD36113 for ; Tue, 5 Nov 2024 19:11:27 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.28724.1730833879301776168 for ; Tue, 05 Nov 2024 11:11:20 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 5B3E240C16; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vt6iXjddghss; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 48A2040CD6; Tue, 5 Nov 2024 19:11:17 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 686291640CD; Tue, 5 Nov 2024 14:11:16 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 2/6] meta-beagle: create a separate layer for Beagle platforms Date: Tue, 5 Nov 2024 14:10:56 -0500 Message-Id: <20241105191100.532413-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241105191100.532413-1-denis@denix.org> References: <20241105191100.532413-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Nov 2024 19:11:27 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18041 From: Denys Dmytriyenko 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 --- 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 \ +" From patchwork Tue Nov 5 19:10:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 51962 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BFA1D3611F for ; Tue, 5 Nov 2024 19:11:28 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.28541.1730833879854445639 for ; Tue, 05 Nov 2024 11:11:20 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 31B7D40CEF; Tue, 5 Nov 2024 19:11:19 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hHkpYWnWuTjM; Tue, 5 Nov 2024 19:11:19 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1E22A40CD7; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7393C1640CE; Tue, 5 Nov 2024 14:11:16 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 3/6] conf/machine: move "bb_org" BSP settings to meta-beagle Date: Tue, 5 Nov 2024 14:10:57 -0500 Message-Id: <20241105191100.532413-3-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241105191100.532413-1-denis@denix.org> References: <20241105191100.532413-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Nov 2024 19:11:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18042 From: Denys Dmytriyenko Define "bb_org" default BSP settings in meta-beagle layer that all Beagle platforms will use. Signed-off-by: Denys Dmytriyenko --- .../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 From patchwork Tue Nov 5 19:10:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 51961 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 013F9D36119 for ; Tue, 5 Nov 2024 19:11:28 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.28543.1730833879916223829 for ; Tue, 05 Nov 2024 11:11:20 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 4115540CD7; Tue, 5 Nov 2024 19:11:19 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r_3ya87YteMd; Tue, 5 Nov 2024 19:11:19 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 2AC0740CDD; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7E65F1640CF; Tue, 5 Nov 2024 14:11:16 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 4/6] conf/machine: split beagleplay config between meta-ti-bsp and meta-beagle Date: Tue, 5 Nov 2024 14:10:58 -0500 Message-Id: <20241105191100.532413-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241105191100.532413-1-denis@denix.org> References: <20241105191100.532413-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Nov 2024 19:11:27 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18044 From: Denys Dmytriyenko 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 --- 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" From patchwork Tue Nov 5 19:10:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 51957 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E60C3D36108 for ; Tue, 5 Nov 2024 19:11:27 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.28542.1730833879904638177 for ; Tue, 05 Nov 2024 11:11:20 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 415EF40D19; Tue, 5 Nov 2024 19:11:19 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h0PAdaSZZINt; Tue, 5 Nov 2024 19:11:19 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1FB7740CD9; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 8A2111640D0; Tue, 5 Nov 2024 14:11:16 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 5/6] conf/machine: move remaining Beagle platforms to meta-beagle Date: Tue, 5 Nov 2024 14:10:59 -0500 Message-Id: <20241105191100.532413-5-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241105191100.532413-1-denis@denix.org> References: <20241105191100.532413-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Nov 2024 19:11:27 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18043 From: Denys Dmytriyenko Include beagle-bsp.inc to define "bb_org" BSP settings and select that as a default. Signed-off-by: Denys Dmytriyenko --- {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 = "" From patchwork Tue Nov 5 19:11:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 51958 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5346D3610E for ; Tue, 5 Nov 2024 19:11:27 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.28727.1730833881927112828 for ; Tue, 05 Nov 2024 11:11:22 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 4E47340C16; Tue, 5 Nov 2024 19:11:21 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GXA_KWUg2gCY; Tue, 5 Nov 2024 19:11:21 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 800CE40CD6; Tue, 5 Nov 2024 19:11:18 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 954E51640D1; Tue, 5 Nov 2024 14:11:16 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 6/6] u-boot-bb_org, linux-bb_org: move "bb_org" providers to meta-beagle Date: Tue, 5 Nov 2024 14:11:00 -0500 Message-Id: <20241105191100.532413-6-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241105191100.532413-1-denis@denix.org> References: <20241105191100.532413-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Nov 2024 19:11:27 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18046 From: Denys Dmytriyenko 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 --- .../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