From patchwork Fri Jun 14 21:57:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 45120 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 D000DC41513 for ; Fri, 14 Jun 2024 21:57:35 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1433.1718402246810660502 for ; Fri, 14 Jun 2024 14:57:27 -0700 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 D8C3440CCE; Fri, 14 Jun 2024 21:57:25 +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 ZbhnTVvfXiuh; Fri, 14 Jun 2024 21:57:25 +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 BB6E040CC7; Fri, 14 Jun 2024 21:57:24 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 5A543163FAC; Fri, 14 Jun 2024 17:57:22 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master/scarthgap][PATCH v2 4/4] conf/machine: use the default TI BSP for BeaglePlay Date: Fri, 14 Jun 2024 17:57:21 -0400 Message-Id: <20240614215721.796496-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240614215721.796496-1-denis@denix.org> References: <20240614215721.796496-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, 14 Jun 2024 21:57:35 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17747 From: Denys Dmytriyenko BeaglePlay gains official support from latest TI lts-6.6 baseline, so set it as the default. Other Beagle platforms will still use BB.org as default. And these defaults can still be changed with TI_PREFERRED_BSP setting in a distro config or by end user in the local.conf Signed-off-by: Denys Dmytriyenko --- v2 - rename TI_DEFAULT_BSP to TI_PREFERRED_BSP meta-ti-bsp/conf/machine/beagle-x15.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone.conf | 3 ++- meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 1 - meta-ti-bsp/conf/machine/beagleplay.conf | 1 - meta-ti-bsp/conf/machine/include/beagle.inc | 1 - 7 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/include/beagle.inc diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index 15815119..53ea0e67 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBoard X15 #@DESCRIPTION: Machine configuration for the BeagleBoard X15 -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/am57xx.inc DT_VENDOR_PREFIX = "ti/omap/" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf index 85669cca..4a2a9491 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBone AI-64 (R5F) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/k3r5.inc SYSFW_SOC = "j721e" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf index 618e27d7..c7bfd6e6 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBone AI-64 (A72) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core) -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/j721e.inc UBOOT_MACHINE = "j721e_evm_a72_config" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 9f5f41e0..0ee7aa39 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -2,7 +2,8 @@ #@NAME: BeagleBone machine #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/ti33x.inc DT_VENDOR_PREFIX = "ti/omap/" diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf index 16503f09..338a6fbf 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -2,7 +2,6 @@ #@NAME: BeaglePlay (R5F) #@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) -require conf/machine/include/beagle.inc require conf/machine/include/k3r5.inc SYSFW_SOC = "am62x" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index 6f042d03..8c83198a 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -2,7 +2,6 @@ #@NAME: BeaglePlay (A53) #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) -require conf/machine//include/beagle.inc require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx" diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc deleted file mode 100644 index e5050096..00000000 --- a/meta-ti-bsp/conf/machine/include/beagle.inc +++ /dev/null @@ -1 +0,0 @@ -TI_PREFERRED_BSP ?= "bb_org"