From patchwork Fri Jun 14 21:57:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 45121 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 CE789C27C6E 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.web10.1408.1718402246826858453 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 E1B3340CC7; 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 fIspCseTcQqs; 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 BA06B40C3A; 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 335F2163FA0; 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 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Date: Fri, 14 Jun 2024 17:57:18 -0400 Message-Id: <20240614215721.796496-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, 14 Jun 2024 21:57:35 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17744 From: Denys Dmytriyenko This adds a facility to define multiple supported BSPs with their own preferences for individual components, as well as lets machine configs specify conditional configurations for different BSPs. Signed-off-by: Denys Dmytriyenko --- v2 - rename TI_DEFAULT_BSP to TI_PREFERRED_BSP meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 3 - meta-ti-bsp/conf/machine/beagleplay.conf | 5 +- meta-ti-bsp/conf/machine/include/am62pxx.inc | 2 +- meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +- meta-ti-bsp/conf/machine/include/am65xx.inc | 2 +- meta-ti-bsp/conf/machine/include/am68.inc | 2 +- meta-ti-bsp/conf/machine/include/am69.inc | 2 +- meta-ti-bsp/conf/machine/include/beagle.inc | 4 +- meta-ti-bsp/conf/machine/include/j721e.inc | 2 +- meta-ti-bsp/conf/machine/include/j721s2.inc | 2 +- meta-ti-bsp/conf/machine/include/j722s.inc | 2 +- meta-ti-bsp/conf/machine/include/j784s4.inc | 2 +- meta-ti-bsp/conf/machine/include/k3.inc | 4 +- meta-ti-bsp/conf/machine/include/k3r5.inc | 4 +- meta-ti-bsp/conf/machine/include/omap-a15.inc | 6 +- meta-ti-bsp/conf/machine/include/omapl138.inc | 4 +- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 109 ++++++++++++++++++ meta-ti-bsp/conf/machine/include/ti-soc.inc | 3 +- meta-ti-bsp/conf/machine/include/ti33x.inc | 7 +- meta-ti-bsp/conf/machine/include/ti43x.inc | 7 +- 20 files changed, 131 insertions(+), 43 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/include/ti-bsp.inc diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf index 601cbbf7..e38029ff 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -4,9 +4,6 @@ require conf/machine/include/k3r5.inc -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" - SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index 02bc6566..a09c0d13 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -11,7 +11,7 @@ MACHINE_FEATURES += "screen gpu" SERIAL_CONSOLES = "115200;ttyS2" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" @@ -25,9 +25,6 @@ UBOOT_MACHINE = "am62x_evm_a53_defconfig" # under meta-ti-bsp/recipes-bsp/u-boot/ for more details. UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" - KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625 \ ti/k3-am62x-sk \ diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index 38e35851..a2825905 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am62pxx" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM62Px is for HS-FS IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index a0ec944f..070a691b 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am62xx" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM62x is for HS-FS IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 48b89638..e033c09b 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am65xx" MACHINE_FEATURES += "screen touchscreen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index cb3d1026..327366be 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM68 is for SR1.0 HS-FS IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index 81be1397..488f9c33 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM69 is for SR1.0 HS-FS IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc index 27e3298d..e5050096 100644 --- a/meta-ti-bsp/conf/machine/include/beagle.inc +++ b/meta-ti-bsp/conf/machine/include/beagle.inc @@ -1,3 +1 @@ - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org" - +TI_PREFERRED_BSP ?= "bb_org" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 6040feb0..a54c3f2f 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721e" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" IMAGE_BOOT_FILES += "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 5289ec5a..9cd88d9b 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on J721S2 is for GP IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index 3b051f1b..3c0717a0 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j722s" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on J722S is for HS-FS IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 92062cdf..883c4a6e 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on J784S4 is for GP IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index e3da9e12..2b82cb82 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -10,9 +10,7 @@ BBMULTICONFIG += "k3r5" # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r0" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc KERNEL_IMAGETYPE = "Image" KERNEL_IMAGETYPES = "Image fitImage" diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 63267a5e..fcd54254 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -11,9 +11,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst + +require conf/machine/include/ti-bsp.inc PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" SPL_SUFFIX = "bin" SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 9ca41403..3637ad0a 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -7,13 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r7" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/conf/machine/include/omapl138.inc b/meta-ti-bsp/conf/machine/include/omapl138.inc index 7f8262a5..486de05d 100644 --- a/meta-ti-bsp/conf/machine/include/omapl138.inc +++ b/meta-ti-bsp/conf/machine/include/omapl138.inc @@ -5,9 +5,7 @@ require conf/machine/include/arm/armv5/tune-arm926ejs.inc KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc EXTRA_IMAGEDEPENDS += "virtual/bootloader" diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc new file mode 100644 index 00000000..3bb94a7f --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -0,0 +1,109 @@ +# Support multiple BSP providers +# The main input is TI_PREFERRED_BSP, which translates into default +# preferences for kernel, bootloader and graphics components, as +# well as a dedicated machine override. + +# Supported options are: mainline, ti-6_6, ti-6_1, bb_org +TI_PREFERRED_BSP ??= "ti-6_6" + +# Use bsp-* namespace for overrides +MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:" + +# ========== +# mainline +# latest upstream/mainline kernel, u-boot +# ========== +BSP_KERNEL_PROVIDER:bsp-mainline = "linux-ti-mainline" +BSP_KERNEL_VERSION:bsp-mainline = "%" +BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline" +BSP_BOOTLOADER_VERSION:bsp-mainline = "%" + +# GPU support requires out-of-tree SGX and Rogue drivers not available +# in mainline, usually present in TI staging or derivative like BB.org +MACHINE_FEATURES:remove:bsp-mainline = "gpu" + +# ========== +# ti-6_6 +# TI staging kernel 6.6, u-boot 2024.04 +# ========== +BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging" +BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" +BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" +BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024%" + +# Only Rogue is enabled so far, SGX falls back to SW rendering +BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver" +BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%" +BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" +BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" + +# ========== +# ti-6_1 +# TI staging kernel 6.1, u-boot 2023.04 +# ========== +BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging" +BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1%" +BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging" +BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%" + +BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km" +BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%" +BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%" +BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver" +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 +# use default preference TI staging and SW-rendering graphics +# ========== +BSP_KERNEL_PROVIDER ?= "linux-ti-staging" +BSP_KERNEL_VERSION ?= "%" +BSP_BOOTLOADER_PROVIDER ?= "u-boot-ti-staging" +BSP_BOOTLOADER_VERSION ?= "%" + +BSP_SGX_DRIVER_PROVIDER ?= "" +BSP_SGX_DRIVER_VERSION ?= "" +BSP_ROGUE_DRIVER_PROVIDER ?= "" +BSP_ROGUE_DRIVER_VERSION ?= "" +BSP_SGX_UMLIBS_VERSION ?= "" +BSP_ROGUE_UMLIBS_VERSION ?= "" +BSP_MESA_PVR_VERSION ?= "" + +# ========== +# global preferences +# ========== +PREFERRED_PROVIDER_virtual/kernel ?= "${BSP_KERNEL_PROVIDER}" +PREFERRED_VERSION_${BSP_KERNEL_PROVIDER} ?= "${BSP_KERNEL_VERSION}" +PREFERRED_PROVIDER_virtual/bootloader ?= "${BSP_BOOTLOADER_PROVIDER}" +PREFERRED_PROVIDER_u-boot ?= "${BSP_BOOTLOADER_PROVIDER}" +PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}" + +# GPU provider gets set in machine configs, as some machines are headless +# Select default preferred versions here +PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}" +PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}" +PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}" +PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}" +PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}" diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index a1fd3cbf..5d77e719 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc @@ -1,9 +1,8 @@ # This is a generic TI SOC family. It is a superset of all other SOCs # and platforms defined in meta-ti to allow BSP-level overrides. SOC_FAMILY = "ti-soc" +require conf/machine/include/soc-family.inc # TI platforms all use devicetrees with overlays MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" KERNEL_DTB_OVERLAY_SUPPORT ?= "1" - -require conf/machine/include/soc-family.inc diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 6fd65b2d..45934aa0 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -7,14 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r22" -# Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 0a3ef4c3..c6a3c510 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -7,14 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r3" -# Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" From patchwork Fri Jun 14 21:57:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 45122 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 32BF8C27C7B for ; Fri, 14 Jun 2024 21:57:36 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1435.1718402246830549261 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 D6B4C40CCB; 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 wnJ1NvGtAiNc; 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 BCB9740CC8; 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 41BCC163FAA; 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 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants Date: Fri, 14 Jun 2024 17:57:19 -0400 Message-Id: <20240614215721.796496-2-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:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17745 From: Denys Dmytriyenko Adjust IMAGE_BOOT_FILES list as some BSPs do not support all combinations of SR1.1, SR2.0, HS-FS and HS-SE variants. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/include/j721e.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index a54c3f2f..62487aa9 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -13,20 +13,22 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" +IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb" +IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = "" +IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}" # Since default on J721e is for GP, add a version for SR1.1 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" +IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb" +IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}" # Since default on J721e is for GP, add a version for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" +IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb" +IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}" # Since default on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" +IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb" +IMAGE_SR2_HS_SE_FILES:bsp-mainline = "" +IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}" TFA_BOARD = "generic" From patchwork Fri Jun 14 21:57:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 45123 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 E6D20C2BA12 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.1434.1718402246816459319 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 E2C5240CC8; 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 MNzE1gRoJJSj; 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 BE08F40CCA; 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 4DAB0163FAB; 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 3/4] conf/machine/beagle*, linux-bb.org: update for multi-BSP support Date: Fri, 14 Jun 2024 17:57:20 -0400 Message-Id: <20240614215721.796496-3-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/17746 From: Denys Dmytriyenko Update all Beagle platform configurations to support multiple BSPs. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/beagle-x15.conf | 18 ++-- .../conf/machine/beaglebone-ai64-k3r5.conf | 8 +- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 23 ++++- meta-ti-bsp/conf/machine/beaglebone.conf | 30 ++++--- meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 9 +- meta-ti-bsp/conf/machine/beagleplay.conf | 48 ++++++++++- .../recipes-kernel/linux/linux-bb.org_git.bb | 84 ------------------- 7 files changed, 100 insertions(+), 120 deletions(-) diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index 706f999a..15815119 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -5,17 +5,21 @@ require conf/machine/include/beagle.inc require conf/machine/include/am57xx.inc +DT_VENDOR_PREFIX = "ti/omap/" +DT_VENDOR_PREFIX:bsp-ti-6_1 = "" +DT_VENDOR_PREFIX:bsp-bb_org = "" + KERNEL_DEVICETREE_PREFIX = " \ -ti/omap/am57xx-beagle-x15 \ -ti/omap/am57xx-idk-lcd \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15 \ +${DT_VENDOR_PREFIX}am57xx-idk-lcd \ " KERNEL_DEVICETREE = " \ -ti/omap/am57xx-beagle-x15.dtb \ -ti/omap/am57xx-beagle-x15-revb1.dtb \ -ti/omap/am57xx-beagle-x15-revc.dtb \ -ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \ -ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15.dtb \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15-revb1.dtb \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15-revc.dtb \ +${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2045.dtbo \ +${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2587.dtbo \ " MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf index 2bf58bce..85669cca 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -2,6 +2,7 @@ #@NAME: BeagleBone AI-64 (R5F) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) +require conf/machine/include/beagle.inc require conf/machine/include/k3r5.inc SYSFW_SOC = "j721e" @@ -15,8 +16,7 @@ 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_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. -UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf index aaf94fa5..618e27d7 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf @@ -6,11 +6,13 @@ require conf/machine/include/beagle.inc require conf/machine/include/j721e.inc UBOOT_MACHINE = "j721e_evm_a72_config" +UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig" -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. -UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config" + +SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" +SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j721e \ @@ -24,4 +26,17 @@ ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ ti/k3-j721e-sk.dtb \ " +KERNEL_DEVICETREE:append:bsp-bb_org = " \ +ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ +ti/k3-j721e-common-proc-board-infotainment.dtbo \ +ti/k3-j721e-evm-csi2-ov5640.dtbo \ +ti/k3-j721e-evm-fusion.dtbo \ +ti/k3-j721e-evm-pcie0-ep.dtbo \ +ti/k3-j721e-evm-virt-mac-client.dtbo \ +ti/k3-j721e-sk-csi2-ov5640.dtbo \ +ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \ +ti/k3-j721e-sk-fusion.dtbo \ +ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \ +" + MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 9d001599..9f5f41e0 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -5,23 +5,27 @@ require conf/machine/include/beagle.inc require conf/machine/include/ti33x.inc +DT_VENDOR_PREFIX = "ti/omap/" +DT_VENDOR_PREFIX:bsp-ti-6_1 = "" +DT_VENDOR_PREFIX:bsp-bb_org = "" + KERNEL_DEVICETREE_PREFIX = " \ -ti/omap/am335x-bone \ -ti/omap/am335x-pocketbeagle \ -ti/omap/am335x-sancloud-bbe \ +${DT_VENDOR_PREFIX}am335x-bone \ +${DT_VENDOR_PREFIX}am335x-pocketbeagle \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe \ " KERNEL_DEVICETREE = " \ -ti/omap/am335x-bone.dtb \ -ti/omap/am335x-boneblack.dtb \ -ti/omap/am335x-boneblack-wireless.dtb \ -ti/omap/am335x-boneblue.dtb \ -ti/omap/am335x-bonegreen.dtb \ -ti/omap/am335x-bonegreen-wireless.dtb \ -ti/omap/am335x-pocketbeagle.dtb \ -ti/omap/am335x-sancloud-bbe.dtb \ -ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \ -ti/omap/am335x-sancloud-bbe-lite.dtb \ +${DT_VENDOR_PREFIX}am335x-bone.dtb \ +${DT_VENDOR_PREFIX}am335x-boneblack.dtb \ +${DT_VENDOR_PREFIX}am335x-boneblack-wireless.dtb \ +${DT_VENDOR_PREFIX}am335x-boneblue.dtb \ +${DT_VENDOR_PREFIX}am335x-bonegreen.dtb \ +${DT_VENDOR_PREFIX}am335x-bonegreen-wireless.dtb \ +${DT_VENDOR_PREFIX}am335x-pocketbeagle.dtb \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe.dtb \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe-extended-wifi.dtb \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe-lite.dtb \ " MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf index e38029ff..16503f09 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -2,6 +2,7 @@ #@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" @@ -9,8 +10,8 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "am62x_evm_r5_defconfig" +UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config" +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.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index a09c0d13..6f042d03 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -19,11 +19,14 @@ TFA_K3_SYSTEM_SUSPEND = "1" OPTEEMACHINE = "k3-am62x" UBOOT_MACHINE = "am62x_evm_a53_defconfig" +UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig" -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config" +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 \ @@ -36,4 +39,41 @@ ti/k3-am625-sk.dtb \ 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" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb index 534fc047..cee9c7cb 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb @@ -14,32 +14,6 @@ DEPENDS += "gmp-native libmpc-native" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" -KERNEL_DEVICETREE:beaglebone = " \ -am335x-bone.dtb \ -am335x-boneblack.dtb \ -am335x-boneblack-pps.dtb \ -am335x-boneblack-uboot.dtb \ -am335x-boneblack-uboot-univ.dtb \ -am335x-boneblack-wireless.dtb \ -am335x-boneblue.dtb \ -am335x-bonegreen.dtb \ -am335x-bonegreen-gateway.dtb \ -am335x-bonegreen-wireless.dtb \ -am335x-bonegreen-wireless-uboot-univ.dtb \ -am335x-pocketbeagle.dtb \ -am335x-sancloud-bbe.dtb \ -am335x-sancloud-bbe-extended-wifi.dtb \ -am335x-sancloud-bbe-lite.dtb \ -" - -KERNEL_DEVICETREE:beagle-x15 = " \ -am57xx-beagle-x15.dtb \ -am57xx-beagle-x15-revb1.dtb \ -am57xx-beagle-x15-revc.dtb \ -am57xx-idk-lcd-osd101t2045.dtbo \ -am57xx-idk-lcd-osd101t2587.dtbo \ -" - # Extra DT overlays/capes KERNEL_DEVICETREE:append:armv7a = " \ AM335X-PRU-UIO-00A0.dtbo \ @@ -76,64 +50,6 @@ PB-MIKROBUS-0.dtbo \ PB-MIKROBUS-1.dtbo \ " -KERNEL_DEVICETREE:beaglebone-ai64 = " \ -ti/k3-j721e-beagleboneai64.dtb \ -ti/k3-j721e-common-proc-board.dtb \ -ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ -ti/k3-j721e-common-proc-board-infotainment.dtbo \ -ti/k3-j721e-evm-csi2-ov5640.dtbo \ -ti/k3-j721e-evm-fusion.dtbo \ -ti/k3-j721e-evm-gesi-exp-board.dtbo \ -ti/k3-j721e-evm-pcie0-ep.dtbo \ -ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ -ti/k3-j721e-evm-virt-mac-client.dtbo \ -ti/k3-j721e-sk.dtb \ -ti/k3-j721e-sk-csi2-ov5640.dtbo \ -ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \ -ti/k3-j721e-sk-fusion.dtbo \ -ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \ -" - -KERNEL_DEVICETREE:beagleplay = " \ -ti/k3-am625-beagleplay.dtb \ -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.dtb \ -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-audio.dtbo \ -ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \ -ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ -ti/k3-am62x-sk-mcan.dtbo \ -" - S = "${WORKDIR}/git" # 6.1.80 version for 32-bit 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"