From patchwork Fri Dec 13 23:31:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 54073 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 25D06E77187 for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.8562.1734132726403539283 for ; Fri, 13 Dec 2024 15:32:07 -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 A01CC40CC6; Fri, 13 Dec 2024 23:32:05 +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 EnpwcnZr_Bqg; Fri, 13 Dec 2024 23:32:05 +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 852B440C21; Fri, 13 Dec 2024 23:32:04 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 4A53C164113; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 01/12] conf/machine: rename beagleplay machine to beagleplay-ti Date: Fri, 13 Dec 2024 18:31:52 -0500 Message-Id: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18109 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 --- No changes since RFC v2 .../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 Fri Dec 13 23:31:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 54076 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 3601AE77188 for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.8563.1734132726661920842 for ; Fri, 13 Dec 2024 15:32:07 -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 AE2B840C21; Fri, 13 Dec 2024 23:32:05 +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 A-h-45elCi56; Fri, 13 Dec 2024 23:32:05 +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 8D29740CC2; Fri, 13 Dec 2024 23:32:04 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 4CEF7164125; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 02/12] meta-beagle: create a separate layer for Beagle platforms Date: Fri, 13 Dec 2024 18:31:53 -0500 Message-Id: <20241213233203.2688541-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18110 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 --- No changes since RFC v2 meta-beagle/COPYING.MIT | 17 +++++++++++++++++ meta-beagle/README | 31 +++++++++++++++++++++++++++++++ meta-beagle/conf/layer.conf | 15 +++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 meta-beagle/COPYING.MIT create mode 100644 meta-beagle/README create mode 100644 meta-beagle/conf/layer.conf diff --git a/meta-beagle/COPYING.MIT b/meta-beagle/COPYING.MIT new file mode 100644 index 00000000..fb950dc6 --- /dev/null +++ b/meta-beagle/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/meta-beagle/README b/meta-beagle/README new file mode 100644 index 00000000..a17e6433 --- /dev/null +++ b/meta-beagle/README @@ -0,0 +1,31 @@ +OpenEmbedded/Yocto layer that extends meta-ti-bsp with BeagleBoard.org platforms. + +It is hosted on http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/ with the +source repository at git://git.yoctoproject.org/meta-ti + + +This layer depends on: + +URI: git://git.openembedded.org/openembedded-core +layers: meta +branch: master + +URI: git://git.yoctoproject.org/meta-arm +layers: meta-arm +branch: master + +URI: git://git.yoctoproject.org/meta-ti +branch: master +revision: HEAD +layers: meta-ti-bsp + + +Send pull requests, patches, comments or questions to: +meta-ti@lists.yoctoproject.org + +Please note - meta-ti mailing list requires subscription for posting: +https://lists.yoctoproject.org/g/meta-ti + +Maintainers: +Denys Dmytriyenko +Ryan Eatmon diff --git a/meta-beagle/conf/layer.conf b/meta-beagle/conf/layer.conf new file mode 100644 index 00000000..df6a77ed --- /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-beagle = " \ + meta-ti-bsp \ +" From patchwork Fri Dec 13 23:31:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 54078 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 44040E7718B for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.8517.1734132726674776598 for ; Fri, 13 Dec 2024 15:32:06 -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 BE67140CC4; Fri, 13 Dec 2024 23:32:05 +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 Wtr_6r5AjLsn; Fri, 13 Dec 2024 23:32:05 +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 A342F40CC3; Fri, 13 Dec 2024 23:32:04 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 5851A164127; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 03/12] meta-beagle: layer.conf: add lz4c to host tools list Date: Fri, 13 Dec 2024 18:31:54 -0500 Message-Id: <20241213233203.2688541-3-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18107 From: Denys Dmytriyenko OE-Core master has switched from lz4c to lz4 host tool, but a corresponding change only appears in kernel 6.13. Since bb.org kernels 6.1 and 6.6 enable LZ4 compression by default, also add a legacy lz4c tool in the list. Signed-off-by: Denys Dmytriyenko --- New patch since RFC v2 meta-beagle/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-beagle/conf/layer.conf b/meta-beagle/conf/layer.conf index df6a77ed..cb448b21 100644 --- a/meta-beagle/conf/layer.conf +++ b/meta-beagle/conf/layer.conf @@ -13,3 +13,5 @@ LAYERSERIES_COMPAT_meta-beagle = "scarthgap styhead walnascar" LAYERDEPENDS_meta-beagle = " \ meta-ti-bsp \ " + +HOSTTOOLS_NONFATAL += "lz4c" From patchwork Fri Dec 13 23:31: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: 54072 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 0DAC6E7717F for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.8516.1734132726489757221 for ; Fri, 13 Dec 2024 15:32:06 -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 B828740CC2; Fri, 13 Dec 2024 23:32:05 +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 QOFaGhW0AKw6; Fri, 13 Dec 2024 23:32:05 +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 A660640CC4; Fri, 13 Dec 2024 23:32:04 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 62C33164128; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 04/12] conf/machine: move "bb_org" BSP settings to meta-beagle Date: Fri, 13 Dec 2024 18:31:55 -0500 Message-Id: <20241213233203.2688541-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18108 From: Denys Dmytriyenko Define "bb_org" default BSP settings in meta-beagle layer that all Beagle platforms will use. Signed-off-by: Denys Dmytriyenko --- No changes since RFC v2 .../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 814c6ca8..4bbe7668 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 @@ -82,25 +82,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 Fri Dec 13 23:31: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: 54081 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 55BC9E7718A for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.8565.1734132728360118974 for ; Fri, 13 Dec 2024 15:32:08 -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 C8B8140CC6; Fri, 13 Dec 2024 23:32:07 +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 k-YRohwd1leV; Fri, 13 Dec 2024 23:32:07 +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 B3F1140CC5; Fri, 13 Dec 2024 23:32:04 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 6DD43164129; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 05/12] conf/machine: split beagleplay config between meta-ti-bsp and meta-beagle Date: Fri, 13 Dec 2024 18:31:56 -0500 Message-Id: <20241213233203.2688541-5-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18112 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 --- No changes since RFC v2 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 Fri Dec 13 23:31: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: 54074 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 28B21E77186 for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.8564.1734132728338632572 for ; Fri, 13 Dec 2024 15:32:08 -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 C89D240CC2; Fri, 13 Dec 2024 23:32:07 +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 Np5aFcr0Voxy; Fri, 13 Dec 2024 23:32:07 +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 C840F40CC3; Fri, 13 Dec 2024 23:32:05 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7976916412B; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 06/12] conf/machine: move remaining Beagle platforms to meta-beagle Date: Fri, 13 Dec 2024 18:31:57 -0500 Message-Id: <20241213233203.2688541-6-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18113 From: Denys Dmytriyenko Include beagle-bsp.inc to define "bb_org" BSP settings and select that as a default. Signed-off-by: Denys Dmytriyenko --- No changes since RFC v2 {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 Fri Dec 13 23:31: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: 54082 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 5EAEDE7717F for ; Fri, 13 Dec 2024 23:32:20 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.8520.1734132730185064703 for ; Fri, 13 Dec 2024 15:32:10 -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 A31C740C21; Fri, 13 Dec 2024 23:32:09 +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 0YGdkKJ9T2p2; Fri, 13 Dec 2024 23:32:09 +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 CF12540CCD; Fri, 13 Dec 2024 23:32:05 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7B46816412C; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 07/12] u-boot-bb_org, linux-bb_org: move "bb_org" providers to meta-beagle Date: Fri, 13 Dec 2024 18:31:58 -0500 Message-Id: <20241213233203.2688541-7-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:20 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18118 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 --- Changes since RFC v2: * apply required SWIG patch from meta-ti-bsp to u-boot recipe .../recipes-bsp/u-boot/u-boot-bb.org_git.bb | 4 +++- ...001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch | 0 ...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, 3 insertions(+), 1 deletion(-) rename {meta-ti-bsp => meta-beagle}/recipes-bsp/u-boot/u-boot-bb.org_git.bb (80%) 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 80% 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..1d895f9c 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" @@ -6,6 +6,8 @@ COMPATIBLE_MACHINE = "beagle.*" PV = "2023.04" +SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" + UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" UBOOT_GIT_PROTOCOL = "https" BRANCH = "v2023.04-ti-09.01.00.008" 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 From patchwork Fri Dec 13 23:31: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: 54079 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 4351BE77189 for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.8566.1734132728369556230 for ; Fri, 13 Dec 2024 15:32:08 -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 D028940C21; Fri, 13 Dec 2024 23:32:07 +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 ADeFnfNDF6F2; Fri, 13 Dec 2024 23:32:07 +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 D4F9540CC7; Fri, 13 Dec 2024 23:32:05 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7D01B16412D; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 08/12] linux-bb.org: update Beagle BSP to 6.1.83 Date: Fri, 13 Dec 2024 18:31:59 -0500 Message-Id: <20241213233203.2688541-8-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18111 From: Denys Dmytriyenko Update Beagle BSP to the latest 6.1.83 kernel version. Signed-off-by: Denys Dmytriyenko --- No changes since RFC v2 .../recipes-kernel/linux/linux-bb.org_git.bb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb index ef79bfb7..986eda68 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb @@ -52,14 +52,14 @@ PB-MIKROBUS-1.dtbo \ S = "${WORKDIR}/git" -# 6.1.80 version for 32-bit -SRCREV:armv7a = "4ca9ea30768d58c8d4d56d03dd1eaf8c8feb7ef9" -PV:armv7a = "6.1.80+git" -BRANCH:armv7a = "v6.1.80-ti-r34" +# 6.1.83 version for 32-bit +SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792" +PV:armv7a = "6.1.83+git" +BRANCH:armv7a = "v6.1.83-ti-r35" -# 6.1.80 version for 64-bit -SRCREV:aarch64 = "977c75e082620f15c06c72bcced30f787c14b390" -PV:aarch64 = "6.1.80+git" -BRANCH:aarch64 = "v6.1.80-ti-arm64-r49" +# 6.1.83 version for 64-bit +SRCREV:aarch64 = "135558243d5a98ed39812b797d2ba6295ef3b86a" +PV:aarch64 = "6.1.83+git" +BRANCH:aarch64 = "v6.1.83-ti-arm64-r64" KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" From patchwork Fri Dec 13 23:32: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: 54080 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 5C278E7718C for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.8567.1734132728427343541 for ; Fri, 13 Dec 2024 15:32:08 -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 D88B540CC4; Fri, 13 Dec 2024 23:32:07 +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 SR66EFB8m6FP; Fri, 13 Dec 2024 23:32:07 +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 DE6D640CC8; Fri, 13 Dec 2024 23:32:05 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 87C0D16412E; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 09/12] conf/machine: add BeagleY-AI platform Date: Fri, 13 Dec 2024 18:32:00 -0500 Message-Id: <20241213233203.2688541-9-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18114 From: Denys Dmytriyenko Add machine configuration for BeagleY-AI platform. Signed-off-by: Denys Dmytriyenko --- No changes since RFC v2 meta-beagle/conf/machine/beagley-ai-k3r5.conf | 14 +++++++++++ meta-beagle/conf/machine/beagley-ai.conf | 23 +++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-bb.org_git.bb | 5 ++++ 3 files changed, 42 insertions(+) create mode 100644 meta-beagle/conf/machine/beagley-ai-k3r5.conf create mode 100644 meta-beagle/conf/machine/beagley-ai.conf diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf new file mode 100644 index 00000000..87462e72 --- /dev/null +++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: BeagleY AI (R5F) +#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core) + +require conf/machine/include/k3r5.inc +require conf/machine/include/beagle-bsp.inc + +SYSFW_SOC = "j722s" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "j722s_evm_r5_defconfig" + +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am67a_beagley_ai_r5.config" diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf new file mode 100644 index 00000000..8dcc9b14 --- /dev/null +++ b/meta-beagle/conf/machine/beagley-ai.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: BeagleY AI (A53) +#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core) + +require conf/machine/include/j722s.inc +require conf/machine/include/beagle-bsp.inc + +UBOOT_MACHINE = "j722s_evm_a53_config" + +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am67a_beagley_ai_a53.config" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j722s \ +" + +KERNEL_DEVICETREE = "" + +KERNEL_DEVICETREE:append:bsp-bb_org = " \ +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_git.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb index 1d895f9c..fb7b0c18 100644 --- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb @@ -17,3 +17,8 @@ BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay" BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay" SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" + +BRANCH:beagley-ai = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" +BRANCH:beagley-ai-k3r5 = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" +SRCREV:beagley-ai = "93735daa6fe024304934d5a5e93ab05a06abf1a8" +SRCREV:beagley-ai-k3r5 = "93735daa6fe024304934d5a5e93ab05a06abf1a8" From patchwork Fri Dec 13 23:32:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 54075 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 1B0AFE77184 for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.8568.1734132728480737932 for ; Fri, 13 Dec 2024 15:32:08 -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 DC92840CC3; Fri, 13 Dec 2024 23:32:07 +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 1zoUsD85RhD0; Fri, 13 Dec 2024 23:32:07 +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 E26AE40CCA; Fri, 13 Dec 2024 23:32:05 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 92A6216412F; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 10/12] linux-bb.org, u-boot-bb.org: rename recipes with version Date: Fri, 13 Dec 2024 18:32:01 -0500 Message-Id: <20241213233203.2688541-10-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18115 From: Denys Dmytriyenko Rename "bb_org" BSP recipes to include version in the recipe names. This way we can support multiple versions. Also remove 2 unused kernel patches that were needed for 5.10 Signed-off-by: Denys Dmytriyenko --- No changes since RFC v2 ...bb.org_git.bb => u-boot-bb.org_2023.04.bb} | 0 .../defconfig | 0 ...void-64-bit-division-in-ioc_timer_fn.patch | 56 ------------------- ...-gcc13-keep-large-values-in-a-new-en.patch | 54 ------------------ ...inux-bb.org_git.bb => linux-bb.org_6.1.bb} | 3 + 5 files changed, 3 insertions(+), 110 deletions(-) rename meta-beagle/recipes-bsp/u-boot/{u-boot-bb.org_git.bb => u-boot-bb.org_2023.04.bb} (100%) rename meta-beagle/recipes-kernel/linux/{linux-bb.org => linux-bb.org-6.1}/defconfig (100%) delete mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch delete mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch rename meta-beagle/recipes-kernel/linux/{linux-bb.org_git.bb => linux-bb.org_6.1.bb} (93%) diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb similarity index 100% rename from meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb rename to meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig similarity index 100% rename from meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig rename to meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig diff --git a/meta-beagle/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 deleted file mode 100644 index a7806c22..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 18 Jan 2023 09:07:01 +0100 -Subject: [PATCH] blk-iocost: avoid 64-bit division in ioc_timer_fn - -The behavior of 'enum' types has changed in gcc-13, so now the -UNBUSY_THR_PCT constant is interpreted as a 64-bit number because -it is defined as part of the same enum definition as some other -constants that do not fit within a 32-bit integer. This in turn -leads to some inefficient code on 32-bit architectures as well -as a link error: - -arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: block/blk-iocost.o: in function `ioc_timer_fn': -blk-iocost.c:(.text+0x68e8): undefined reference to `__aeabi_uldivmod' -arm-linux-gnueabi-ld: blk-iocost.c:(.text+0x6908): undefined reference to `__aeabi_uldivmod' - -Split the enum definition to keep the 64-bit timing constants in -a separate enum type from those constants that can clearly fit -within a smaller type. - -Signed-off-by: Arnd Bergmann -Acked-by: Tejun Heo -Link: https://lore.kernel.org/r/20230118080706.3303186-1-arnd@kernel.org -Signed-off-by: Jens Axboe ---- - block/blk-iocost.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/block/blk-iocost.c b/block/blk-iocost.c -index 6955605629e4..b691b6bb498f 100644 ---- a/block/blk-iocost.c -+++ b/block/blk-iocost.c -@@ -258,6 +258,11 @@ enum { - VRATE_MIN = VTIME_PER_USEC * VRATE_MIN_PPM / MILLION, - VRATE_CLAMP_ADJ_PCT = 4, - -+ /* switch iff the conditions are met for longer than this */ -+ AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, -+}; -+ -+enum { - /* if IOs end up waiting for requests, issue less */ - RQ_WAIT_BUSY_PCT = 5, - -@@ -296,9 +301,6 @@ enum { - /* don't let cmds which take a very long time pin lagging for too long */ - MAX_LAGGING_PERIODS = 10, - -- /* switch iff the conditions are met for longer than this */ -- AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, -- - /* - * Count IO size in 4k pages. The 12bit shift helps keeping - * size-proportional components of cost calculation in closer --- -2.40.1 diff --git a/meta-beagle/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 deleted file mode 100644 index f5d0f476..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ff1cc97b1f4c10db224f276d9615b22835b8c424 Mon Sep 17 00:00:00 2001 -From: "Jiri Slaby (SUSE)" -Date: Tue, 13 Dec 2022 13:08:26 +0100 -Subject: [PATCH] block/blk-iocost (gcc13): keep large values in a new enum - -Since gcc13, each member of an enum has the same type as the enum [1]. And -that is inherited from its members. Provided: - VTIME_PER_SEC_SHIFT = 37, - VTIME_PER_SEC = 1LLU << VTIME_PER_SEC_SHIFT, - ... - AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, -the named type is unsigned long. - -This generates warnings with gcc-13: - block/blk-iocost.c: In function 'ioc_weight_prfill': - block/blk-iocost.c:3037:37: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int' - - block/blk-iocost.c: In function 'ioc_weight_show': - block/blk-iocost.c:3047:34: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int' - -So split the anonymous enum with large values to a separate enum, so -that they don't affect other members. - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113 - -Cc: Martin Liska -Cc: Tejun Heo -Cc: Josef Bacik -Cc: Jens Axboe -Cc: cgroups@vger.kernel.org -Cc: linux-block@vger.kernel.org -Signed-off-by: Jiri Slaby (SUSE) -Link: https://lore.kernel.org/r/20221213120826.17446-1-jirislaby@kernel.org -Signed-off-by: Jens Axboe ---- - block/blk-iocost.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/block/blk-iocost.c b/block/blk-iocost.c -index d1bdc12deaa7..549ddc9e0c6f 100644 ---- a/block/blk-iocost.c -+++ b/block/blk-iocost.c -@@ -232,7 +232,9 @@ enum { - - /* 1/64k is granular enough and can easily be handled w/ u32 */ - WEIGHT_ONE = 1 << 16, -+}; - -+enum { - /* - * As vtime is used to calculate the cost of each IO, it needs to - * be fairly high precision. For example, it should be able to --- -2.40.1 diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb similarity index 93% rename from meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb rename to meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb index 986eda68..063bcac3 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb @@ -1,3 +1,6 @@ +# Look in the generic major.minor directory for files +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" + SECTION = "kernel" SUMMARY = "BeagleBoard.org Linux kernel" LICENSE = "GPL-2.0-only" From patchwork Fri Dec 13 23:32:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 54077 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 081F9E77180 for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.8518.1734132729145336173 for ; Fri, 13 Dec 2024 15:32:09 -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 DFDD540CC5; Fri, 13 Dec 2024 23:32:07 +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 qjGGvGQpXelS; Fri, 13 Dec 2024 23:32:07 +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 E2A3C40CCB; Fri, 13 Dec 2024 23:32:05 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 9D948164130; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 11/12] beagle-bsp, linux-bb.org, u-boot-bb.org: add support for 6.6 BSP Date: Fri, 13 Dec 2024 18:32:02 -0500 Message-Id: <20241213233203.2688541-11-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18117 From: Denys Dmytriyenko Most Beagle platforms are switching to 6.6 based Linux kernel and U-boot 2024.10. Add corresponding recipes and extend beagle-bsp with required settings. BeagleY-AI for now remains on 6.1 BSP with U-boot 2023.04. Signed-off-by: Denys Dmytriyenko --- Changes since RFC v2: * bump kernel to 6.6.58 for 64-bit platforms * add 6.6.32 for 32-bit platforms * replace upstream 2024.07 u-boot with bb.org 2024.10 * make 6.6 the default for most platforms, except BeagleY-AI * correct some leftovers of the old :bsp-bb_org override * refresh device tree lists * revise u-boot defconfig and config fragment selection * apply required SWIG patch from meta-ti-bsp to u-boot recipe * use unsigned SPL binaries meta-beagle/conf/machine/beagle-x15.conf | 2 +- .../conf/machine/beaglebone-ai64-k3r5.conf | 8 ++- meta-beagle/conf/machine/beaglebone-ai64.conf | 19 ++++-- meta-beagle/conf/machine/beaglebone.conf | 2 +- meta-beagle/conf/machine/beagleplay-k3r5.conf | 5 +- meta-beagle/conf/machine/beagleplay.conf | 37 +++++++++- meta-beagle/conf/machine/beagley-ai-k3r5.conf | 4 +- meta-beagle/conf/machine/beagley-ai.conf | 6 +- .../conf/machine/include/beagle-bsp.inc | 47 +++++++++---- .../u-boot/u-boot-bb.org_2024.10.bb | 14 ++++ .../linux/linux-bb.org-6.6/defconfig | 1 + .../recipes-kernel/linux/linux-bb.org_6.6.bb | 68 +++++++++++++++++++ 12 files changed, 182 insertions(+), 31 deletions(-) create mode 100644 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb create mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig create mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb diff --git a/meta-beagle/conf/machine/beagle-x15.conf b/meta-beagle/conf/machine/beagle-x15.conf index e9ab5d40..8ad028f4 100644 --- a/meta-beagle/conf/machine/beagle-x15.conf +++ b/meta-beagle/conf/machine/beagle-x15.conf @@ -7,7 +7,7 @@ require conf/machine/include/beagle-bsp.inc DT_VENDOR_PREFIX = "ti/omap/" DT_VENDOR_PREFIX:bsp-ti-6_1 = "" -DT_VENDOR_PREFIX:bsp-bb_org = "" +DT_VENDOR_PREFIX:bsp-bb_org-6_1 = "" KERNEL_DEVICETREE_PREFIX = " \ ${DT_VENDOR_PREFIX}am57xx-beagle-x15 \ diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf index 95d3abc0..4574f82b 100644 --- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf @@ -15,8 +15,10 @@ UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" -UBOOT_MACHINE = "j721e_evm_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig" +UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config" +UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config" + +UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_r5_defconfig" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_r5.config" diff --git a/meta-beagle/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf index faffd0bb..a521c8cf 100644 --- a/meta-beagle/conf/machine/beaglebone-ai64.conf +++ b/meta-beagle/conf/machine/beaglebone-ai64.conf @@ -5,18 +5,25 @@ 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 = "" +IMAGE_SR1_1_HS_FS_FILES = "" +IMAGE_SR1_1_HS_SE_FILES = "" +IMAGE_SR2_HS_FS_FILES = "" +IMAGE_SR2_HS_SE_FILES = "" -UBOOT_MACHINE = "j721e_evm_a72_config" -UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig" +UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig" +UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_a72_config" UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" -UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config" + +UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config" SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" +SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" +SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" + KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j721e \ " @@ -29,7 +36,7 @@ ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ ti/k3-j721e-sk.dtb \ " -KERNEL_DEVICETREE:append:bsp-bb_org = " \ +KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ ti/k3-j721e-common-proc-board-infotainment.dtbo \ ti/k3-j721e-evm-csi2-ov5640.dtbo \ diff --git a/meta-beagle/conf/machine/beaglebone.conf b/meta-beagle/conf/machine/beaglebone.conf index 6048383b..456da618 100644 --- a/meta-beagle/conf/machine/beaglebone.conf +++ b/meta-beagle/conf/machine/beaglebone.conf @@ -7,7 +7,7 @@ require conf/machine/include/beagle-bsp.inc DT_VENDOR_PREFIX = "ti/omap/" DT_VENDOR_PREFIX:bsp-ti-6_1 = "" -DT_VENDOR_PREFIX:bsp-bb_org = "" +DT_VENDOR_PREFIX:bsp-bb_org-6_1 = "" KERNEL_DEVICETREE_PREFIX = " \ ${DT_VENDOR_PREFIX}am335x-bone \ diff --git a/meta-beagle/conf/machine/beagleplay-k3r5.conf b/meta-beagle/conf/machine/beagleplay-k3r5.conf index 1423aa10..3e7f0c1b 100644 --- a/meta-beagle/conf/machine/beagleplay-k3r5.conf +++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf @@ -3,6 +3,9 @@ #@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" +UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_r5_defconfig" + +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config" diff --git a/meta-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf index 1977b4c1..b1a463e1 100644 --- a/meta-beagle/conf/machine/beagleplay.conf +++ b/meta-beagle/conf/machine/beagleplay.conf @@ -3,11 +3,17 @@ #@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" +UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_a53_defconfig" + +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config" + +SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" +SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" -KERNEL_DEVICETREE:append:bsp-bb_org = " \ +KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \ @@ -43,3 +49,30 @@ ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \ ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ ti/k3-am62x-sk-mcan.dtbo \ " + +KERNEL_DEVICETREE:append:bsp-bb_org-6_6 = " \ +ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ +ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ +ti/k3-am625-beagleplay.dtb \ +ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \ +ti/k3-am625-minimal.dtb \ +ti/k3-am625-sk.dtb \ +ti/k3-am625-sk-ecap-capture.dtbo \ +ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \ +ti/k3-am625-sk-m2-cc3301.dtbo \ +ti/k3-am625-sk-mcspi-loopback.dtbo \ +ti/k3-am625-sk-microtips-mf101hie-panel.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-dmtimer-pwm.dtbo \ +ti/k3-am62x-sk-eqep.dtbo \ +ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \ +ti/k3-am62x-sk-hdmi-audio.dtbo \ +ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ +ti/k3-am62x-sk-mcan.dtbo \ +ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \ +ti/k3-am62x-sk-pwm.dtbo \ +" diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf index 87462e72..6cc370d1 100644 --- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf +++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf @@ -3,6 +3,8 @@ #@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" @@ -11,4 +13,4 @@ SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "j722s_evm_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am67a_beagley_ai_r5.config" +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 8dcc9b14..9b1832d2 100644 --- a/meta-beagle/conf/machine/beagley-ai.conf +++ b/meta-beagle/conf/machine/beagley-ai.conf @@ -3,11 +3,13 @@ #@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_CONFIG_FRAGMENTS:bsp-bb_org = "am67a_beagley_ai_a53.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j722s \ @@ -15,7 +17,7 @@ KERNEL_DEVICETREE_PREFIX = " \ KERNEL_DEVICETREE = "" -KERNEL_DEVICETREE:append:bsp-bb_org = " \ +KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ ti/k3-j722s-evm.dtb \ ti/k3-am67a-beagley-ai.dtb \ " diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc index 77d0b483..34889b41 100644 --- a/meta-beagle/conf/machine/include/beagle-bsp.inc +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc @@ -1,24 +1,43 @@ # 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" +# Default is bb_org-6_6, but can override with any of the existing options +TI_PREFERRED_BSP ?= "bb_org-6_6" # ========== -# bb_org +# bb_org-6_1 # 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_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org" +BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%" +BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org" +BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%" -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%" +BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-sgx-ddk-km" +BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%" +BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%" +BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver" +BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%" +BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%" +BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%" + +# ========== +# bb_org-6_6 +# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07 +# 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-6_6 = "linux-bb.org" +BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%" +BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org" +BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%" + +BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km" +BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%" +BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%" +BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver" +BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%" +BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%" +BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "23%" diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb new file mode 100644 index 00000000..389893b0 --- /dev/null +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb @@ -0,0 +1,14 @@ +require recipes-bsp/u-boot/u-boot-ti.inc + +SUMMARY = "BeagleBoard.org U-Boot" + +COMPATIBLE_MACHINE = "beagle.*" + +PV = "2024.10" + +SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch" + +UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" +UBOOT_GIT_PROTOCOL = "https" +BRANCH = "v2024.10-Beagle" +SRCREV = "bf0e9d0b7274d2b561bd24c858affec2038250f9" diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig new file mode 100644 index 00000000..a5de2e24 --- /dev/null +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig @@ -0,0 +1 @@ +use-kernel-config=bb.org_defconfig diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb new file mode 100644 index 00000000..bf8f8a24 --- /dev/null +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb @@ -0,0 +1,68 @@ +# Look in the generic major.minor directory for files +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:" + +SECTION = "kernel" +SUMMARY = "BeagleBoard.org Linux kernel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +COMPATIBLE_MACHINE = "beagle.*" + +inherit kernel + +require recipes-kernel/linux/setup-defconfig.inc +require recipes-kernel/linux/ti-kernel.inc + +DEPENDS += "gmp-native libmpc-native" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" + +# Extra DT overlays/capes +KERNEL_DEVICETREE:append:armv7a = " \ +${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \ +${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \ +${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \ +${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \ +${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \ +${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \ +${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \ +${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \ +${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \ +${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \ +${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \ +${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \ +${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \ +${DT_VENDOR_PREFIX}BONE-ADC.dtbo \ +${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \ +${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \ +${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \ +${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \ +" + +S = "${WORKDIR}/git" + +# 6.6.32 version for 32-bit +SRCREV:armv7a = "525684d28fadc2bdae5424f28b219377bd5d4639" +PV:armv7a = "6.6.32+git" +BRANCH:armv7a = "v6.6.32-ti-arm32-r7" + +# 6.6.58 version for 64-bit +SRCREV:aarch64 = "9beffa9162f6a0f5de7e25bbb66026a579376428" +PV:aarch64 = "6.6.58+git" +BRANCH:aarch64 = "v6.6.58-ti-arm64-r16" + +KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" From patchwork Fri Dec 13 23:32:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 54071 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 0A496E77183 for ; Fri, 13 Dec 2024 23:32:10 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.8519.1734132729145501537 for ; Fri, 13 Dec 2024 15:32:09 -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 E6C1F40CC7; Fri, 13 Dec 2024 23:32:07 +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 GZ0kdFw64IbV; Fri, 13 Dec 2024 23:32:07 +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 EF1D340CCC; Fri, 13 Dec 2024 23:32:05 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id A046D164131; Fri, 13 Dec 2024 18:32:04 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 12/12] linux-bb.org_6.6: disable FORTIFY_SOURCE for now Date: Fri, 13 Dec 2024 18:32:03 -0500 Message-Id: <20241213233203.2688541-12-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241213233203.2688541-1-denis@denix.org> References: <20241213233203.2688541-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 ; Fri, 13 Dec 2024 23:32:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18116 From: Denys Dmytriyenko Rogue graphics driver 24.1 currently fails to build against the kernel that enables FORTIFY_SOURCE, such as bb.org. Disable this config for now, until the driver is fixed. Signed-off-by: Denys Dmytriyenko --- New patch since RFC v2 .../recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg | 1 + meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg new file mode 100644 index 00000000..808f9519 --- /dev/null +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg @@ -0,0 +1 @@ +CONFIG_FORTIFY_SOURCE=n diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb index bf8f8a24..c50802e4 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb @@ -66,3 +66,6 @@ PV:aarch64 = "6.6.58+git" BRANCH:aarch64 = "v6.6.58-ti-arm64-r16" KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" + +SRC_URI += "file://no-fortify.cfg" +KERNEL_CONFIG_FRAGMENTS += "${UNPACKDIR}/no-fortify.cfg"