* [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
@ 2024-06-13 17:22 Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants Denys Dmytriyenko
` (4 more replies)
0 siblings, 5 replies; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-13 17:22 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
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 <denys@konsulko.com>
---
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_DEFAULT_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_DEFAULT_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_DEFAULT_BSP ??= "ti-6_6"
+
+# Use bsp-* namespace for overrides
+MACHINEOVERRIDES =. "bsp-${TI_DEFAULT_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"
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants
2024-06-13 17:22 [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Denys Dmytriyenko
@ 2024-06-13 17:22 ` Denys Dmytriyenko
2024-06-14 10:20 ` [EXTERNAL] [meta-ti] " Limaye, Aniket
2024-06-13 17:22 ` [master/scarthgap][PATCH 3/4] conf/machine/beagle*, linux-bb.org: update for multi-BSP support Denys Dmytriyenko
` (3 subsequent siblings)
4 siblings, 1 reply; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-13 17:22 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
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 <denys@konsulko.com>
---
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"
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [master/scarthgap][PATCH 3/4] conf/machine/beagle*, linux-bb.org: update for multi-BSP support
2024-06-13 17:22 [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants Denys Dmytriyenko
@ 2024-06-13 17:22 ` Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 4/4] conf/machine: use the default TI BSP for BeaglePlay Denys Dmytriyenko
` (2 subsequent siblings)
4 siblings, 0 replies; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-13 17:22 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Update all Beagle platform configurations to support multiple BSPs.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
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
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [master/scarthgap][PATCH 4/4] conf/machine: use the default TI BSP for BeaglePlay
2024-06-13 17:22 [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 3/4] conf/machine/beagle*, linux-bb.org: update for multi-BSP support Denys Dmytriyenko
@ 2024-06-13 17:22 ` Denys Dmytriyenko
2024-06-13 19:29 ` [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Ryan Eatmon
2024-06-13 21:18 ` Ryan Eatmon
4 siblings, 0 replies; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-13 17:22 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
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_DEFAULT_BSP setting in a
distro config or by end user in the local.conf
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
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_DEFAULT_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_DEFAULT_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_DEFAULT_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_DEFAULT_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_DEFAULT_BSP ?= "bb_org"
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-13 17:22 [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Denys Dmytriyenko
` (2 preceding siblings ...)
2024-06-13 17:22 ` [master/scarthgap][PATCH 4/4] conf/machine: use the default TI BSP for BeaglePlay Denys Dmytriyenko
@ 2024-06-13 19:29 ` Ryan Eatmon
2024-06-13 19:47 ` Denys Dmytriyenko
2024-06-13 21:18 ` Ryan Eatmon
4 siblings, 1 reply; 17+ messages in thread
From: Ryan Eatmon @ 2024-06-13 19:29 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-ti; +Cc: Denys Dmytriyenko
On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
>
> 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 <denys@konsulko.com>
> ---
<snip>
> +
> +# ==========
> +# 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%"
I wonder if I can use this same system to support the upstream
testing... After we accept this series I need to look at how the
upstream testing flow can leverage this concept.
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-13 19:29 ` [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Ryan Eatmon
@ 2024-06-13 19:47 ` Denys Dmytriyenko
2024-06-13 21:09 ` Ryan Eatmon
0 siblings, 1 reply; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-13 19:47 UTC (permalink / raw)
To: Ryan Eatmon; +Cc: meta-ti, Denys Dmytriyenko
On Thu, Jun 13, 2024 at 02:29:34PM -0500, Ryan Eatmon wrote:
>
>
> On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >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 <denys@konsulko.com>
> >---
>
> <snip>
>
> >+
> >+# ==========
> >+# 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%"
>
> I wonder if I can use this same system to support the upstream
> testing... After we accept this series I need to look at how the
> upstream testing flow can leverage this concept.
That's the mainline setup...
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-13 19:47 ` Denys Dmytriyenko
@ 2024-06-13 21:09 ` Ryan Eatmon
2024-06-14 17:20 ` Denys Dmytriyenko
0 siblings, 1 reply; 17+ messages in thread
From: Ryan Eatmon @ 2024-06-13 21:09 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Denys Dmytriyenko
On 6/13/2024 2:47 PM, Denys Dmytriyenko wrote:
> On Thu, Jun 13, 2024 at 02:29:34PM -0500, Ryan Eatmon wrote:
>>
>>
>> On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@konsulko.com>
>>>
>>> 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 <denys@konsulko.com>
>>> ---
>>
>> <snip>
>>
>>> +
>>> +# ==========
>>> +# 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%"
>>
>> I wonder if I can use this same system to support the upstream
>> testing... After we accept this series I need to look at how the
>> upstream testing flow can leverage this concept.
>
> That's the mainline setup...
For the kernel we use linux-ti-next not mainline.
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-13 17:22 [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Denys Dmytriyenko
` (3 preceding siblings ...)
2024-06-13 19:29 ` [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Ryan Eatmon
@ 2024-06-13 21:18 ` Ryan Eatmon
2024-06-14 6:27 ` [EXTERNAL] " Chirag Shilwant
` (2 more replies)
4 siblings, 3 replies; 17+ messages in thread
From: Ryan Eatmon @ 2024-06-13 21:18 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-ti; +Cc: Denys Dmytriyenko
On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
>
> 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 <denys@konsulko.com>
> 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_DEFAULT_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_DEFAULT_BSP ??= "ti-6_6"
Should this variable be named TI_DEFAULT_BSP? That implies that this is
the value of the default for this feature. But in reality this variable
is what chooses the TI BSP version. Should it be something like
TI_BSP_VERSION instead?
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [EXTERNAL] Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-13 21:18 ` Ryan Eatmon
@ 2024-06-14 6:27 ` Chirag Shilwant
2024-06-14 16:34 ` Denys Dmytriyenko
[not found] ` <17D8EC1D0CB8CAB1.25108@lists.yoctoproject.org>
2 siblings, 0 replies; 17+ messages in thread
From: Chirag Shilwant @ 2024-06-14 6:27 UTC (permalink / raw)
To: meta-ti
Cc: Denys Dmytriyenko, Gyan Gupta, reatmon, Denys Dmytriyenko,
Praneeth Bajjuri
Hi,
On 14/06/24 02:48, Ryan Eatmon via lists.yoctoproject.org wrote:
> On 6/13/2024 12: 22 PM, Denys Dmytriyenko wrote: > From: Denys
> Dmytriyenko <denys@ konsulko. com> > > This adds a facility to define
> multiple supported BSPs with their own > preferences for individual
> components, as well as lets
> ZjQcmQRYFpfptBannerStart
> This message was sent from outside of Texas Instruments.
> Do not click links or open attachments unless you recognize the source
> of this email and know the content is safe. If you wish to report this
> message to IT Security, please forward the message as an attachment to
> phishing@list.ti.com
> ZjQcmQRYFpfptBannerEnd
> On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
> > From: Denys Dmytriyenko <denys@konsulko.com>
> >
> > 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 <denys@konsulko.com>
>
>
>
> > 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_DEFAULT_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_DEFAULT_BSP ??= "ti-6_6"
>
> Should this variable be named TI_DEFAULT_BSP? That implies that this is
> the value of the default for this feature. But in reality this variable
> is what chooses the TI BSP version. Should it be something like
> TI_BSP_VERSION instead?
Yeah, I agree with Ryan. TI_BSP_VERSION or evenTI_DEFAULT_BSP_VERSION
sounds more appropriate.
Regards,
Chirag
>
>
>
> --
> Ryan Eatmon reatmon@ti.com
> -----------------------------------------
> Texas Instruments, Inc. - LCPD - MGTS
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17726): https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/message/17726__;!!G3vK!U20F4gdpOgKdlGIbMEeQpRYgCKi78PnQ6YHMrbGMH1hlJTtzu_lGfmzbJo65qk3jLSUv9WYdTMcNDNNnyKMh2-VE1HTlFHCXiw$
> Mute This Topic: https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/106655975/7030289__;!!G3vK!U20F4gdpOgKdlGIbMEeQpRYgCKi78PnQ6YHMrbGMH1hlJTtzu_lGfmzbJo65qk3jLSUv9WYdTMcNDNNnyKMh2-VE1HQhq36_xA$
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/unsub__;!!G3vK!U20F4gdpOgKdlGIbMEeQpRYgCKi78PnQ6YHMrbGMH1hlJTtzu_lGfmzbJo65qk3jLSUv9WYdTMcNDNNnyKMh2-VE1HSRPq9VLw$ [c-shilwant@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [EXTERNAL] [meta-ti] [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants
2024-06-13 17:22 ` [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants Denys Dmytriyenko
@ 2024-06-14 10:20 ` Limaye, Aniket
2024-06-14 16:38 ` Denys Dmytriyenko
0 siblings, 1 reply; 17+ messages in thread
From: Limaye, Aniket @ 2024-06-14 10:20 UTC (permalink / raw)
To: meta-ti; +Cc: Francis, Neha, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 4743 bytes --]
Hi Denys,
On 6/13/2024 10:52 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ konsulko. com> 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
> <denys@ konsulko. com> --- meta-ti-bsp/conf/machine/include/j721e. inc
> ZjQcmQRYFpfptBannerStart
> From: Denys Dmytriyenko <denys@konsulko.com>
> 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<denys@konsulko.com>
> ---
Same change is needed for J7200 as well. At the current commit pointed
by u-boot-ti-mainline [1], j7200 only has support for below:
GP , SR2.0 HS-FS , SR2.0 HS-SE
Hence also suggest below for j7200.inc:
diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc
b/meta-ti-bsp/conf/machine/include/j7200.inc
index caa79876..2a11e3dd 100644
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -5,10 +5,14 @@ SOC_FAMILY:append = ":j7200"
IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
# Since default tiboot3.bin on J7200 is for GP, add a version for
SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"
+IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
+IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
# Since default tiboot3.bin on J7200 is for GP, add a version for
SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin"
+IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
+IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
# Since default tiboot3.bin on J7200 is for GP, add a version for
SR2.0 HS-FS
IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
[1]:
https://source.denx.de/u-boot/u-boot/-/blob/866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e/arch/arm/dts/k3-j7200-binman.dtsi
> 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"
>
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17720):https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/message/17720__;!!G3vK!ViJQwrQKeC3qqXVZ8kKcUDbfpHLQlIvvjLNyHFQgHl3_TFIS3cLW8FGbQrROSxcrLl16vBx3jw$
> Mute This Topic:https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/106655976/6607860__;!!G3vK!ViJQwrQKeC3qqXVZ8kKcUDbfpHLQlIvvjLNyHFQgHl3_TFIS3cLW8FGbQrROSxcrLl2K7krThA$
> Group Owner:meta-ti+owner@lists.yoctoproject.org
> Unsubscribe:https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/unsub__;!!G3vK!ViJQwrQKeC3qqXVZ8kKcUDbfpHLQlIvvjLNyHFQgHl3_TFIS3cLW8FGbQrROSxcrLl1EHYbH3A$ [a-limaye@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
[-- Attachment #2: Type: text/html, Size: 8888 bytes --]
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-13 21:18 ` Ryan Eatmon
2024-06-14 6:27 ` [EXTERNAL] " Chirag Shilwant
@ 2024-06-14 16:34 ` Denys Dmytriyenko
[not found] ` <17D8EC1D0CB8CAB1.25108@lists.yoctoproject.org>
2 siblings, 0 replies; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-14 16:34 UTC (permalink / raw)
To: Ryan Eatmon; +Cc: meta-ti, Denys Dmytriyenko
On Thu, Jun 13, 2024 at 04:18:16PM -0500, Ryan Eatmon wrote:
>
>
> On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >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 <denys@konsulko.com>
>
>
>
> >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_DEFAULT_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_DEFAULT_BSP ??= "ti-6_6"
>
> Should this variable be named TI_DEFAULT_BSP? That implies that
> this is the value of the default for this feature. But in reality
> this variable is what chooses the TI BSP version. Should it be
> something like TI_BSP_VERSION instead?
It's not just the version, it's entire BSP stack. E.g. "mainline" vs. "bb_org"
Initially I started with only 2 options - "ti" vs. "bb_org", but eventually
expanded it to support "mainline" and in case of "ti" also different LTS
versions - "ti-6_1" and "ti-6_6"... Hence the original name stayed. And not
sure how long both LTS versions will be supported in meta-ti...
Anyway, I'm fine changing it to something else, but I thing calling it
"version" will be more confusing.
--
Denys
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants
2024-06-14 10:20 ` [EXTERNAL] [meta-ti] " Limaye, Aniket
@ 2024-06-14 16:38 ` Denys Dmytriyenko
2024-06-17 14:01 ` Limaye, Aniket
0 siblings, 1 reply; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-14 16:38 UTC (permalink / raw)
To: a-limaye; +Cc: meta-ti, Francis, Neha, Denys Dmytriyenko
On Fri, Jun 14, 2024 at 03:50:14PM +0530, Aniket Limaye via lists.yoctoproject.org wrote:
> Hi Denys,
>
> On 6/13/2024 10:52 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@ konsulko. com> 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 <denys@ konsulko. com> ---
> >meta-ti-bsp/conf/machine/include/j721e. inc
> >ZjQcmQRYFpfptBannerStart
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >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<denys@konsulko.com>
> >---
>
> Same change is needed for J7200 as well. At the current commit
> pointed by u-boot-ti-mainline [1], j7200 only has support for below:
> GP , SR2.0 HS-FS , SR2.0 HS-SE
>
> Hence also suggest below for j7200.inc:
>
> diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc
> b/meta-ti-bsp/conf/machine/include/j7200.inc
> index caa79876..2a11e3dd 100644
> --- a/meta-ti-bsp/conf/machine/include/j7200.inc
> +++ b/meta-ti-bsp/conf/machine/include/j7200.inc
> @@ -5,10 +5,14 @@ SOC_FAMILY:append = ":j7200"
> IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
>
> # Since default tiboot3.bin on J7200 is for GP, add a version for
> SR1.0 HS-FS
> -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"
> +IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
> +IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
> +IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
>
> # Since default tiboot3.bin on J7200 is for GP, add a version for
> SR1.0 HS-SE
> -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin"
> +IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
> +IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
> +IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
>
> # Since default tiboot3.bin on J7200 is for GP, add a version for
> SR2.0 HS-FS
> IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
>
>
> [1]: https://source.denx.de/u-boot/u-boot/-/blob/866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e/arch/arm/dts/k3-j7200-binman.dtsi
Thanks! Patches are welcome.
It wasn't possible for me to test all platforms for all 4 supported "BSPs" - I
only focused on all Beagles and few EVMs, so some could have been missed,
especially for the "mainline" BSP.
> > 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"
> >--
> >2.25.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-13 21:09 ` Ryan Eatmon
@ 2024-06-14 17:20 ` Denys Dmytriyenko
0 siblings, 0 replies; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-14 17:20 UTC (permalink / raw)
To: Ryan Eatmon; +Cc: meta-ti, Denys Dmytriyenko
On Thu, Jun 13, 2024 at 04:09:46PM -0500, Ryan Eatmon wrote:
>
>
> On 6/13/2024 2:47 PM, Denys Dmytriyenko wrote:
> >On Thu, Jun 13, 2024 at 02:29:34PM -0500, Ryan Eatmon wrote:
> >>
> >>
> >>On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
> >>>From: Denys Dmytriyenko <denys@konsulko.com>
> >>>
> >>>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 <denys@konsulko.com>
> >>>---
> >>
> >><snip>
> >>
> >>>+
> >>>+# ==========
> >>>+# 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%"
> >>
> >>I wonder if I can use this same system to support the upstream
> >>testing... After we accept this series I need to look at how the
> >>upstream testing flow can leverage this concept.
> >
> >That's the mainline setup...
>
> For the kernel we use linux-ti-next not mainline.
Right, linux-next tree vs. torvalds one. I considered supporting both in
ti-bsp.inc, but thought that mainline pulling torvalds tree would be more
useful for 99% of meta-ti users, than pulling ever-changing linux-next.
Other than the kernel tree, the rest is exactly the same as bsp-mainline,
and it is still possible to overwrite PREFERRED_PROVIDER on top:
https://git.yoctoproject.org/meta-arago/tree/meta-arago-distro/conf/distro/include/branding-next.inc?h=scarthgap-wip
Even w/o meta-arago, all it takes is 2 lines:
TI_DEFAULT_BSP = "mainline"
PREFERRED_PROVIDER_virtual/kernel = "linux-ti-next"
BTW, linux-ti-next and linux-ti-mainline recipes originally were quite
different, but over time became very similar. I'm thinking these can be
cleaned up and unified - either one includes another and adjusts SRC_URI,
or potentially even a single recipe with a switch...
--
Denys
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
[not found] ` <17D8EC1D0CB8CAB1.25108@lists.yoctoproject.org>
@ 2024-06-14 18:55 ` Denys Dmytriyenko
2024-06-14 19:29 ` Ryan Eatmon
0 siblings, 1 reply; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-14 18:55 UTC (permalink / raw)
To: Ryan Eatmon; +Cc: meta-ti, Denys Dmytriyenko
On Fri, Jun 14, 2024 at 12:34:23PM -0400, Denys Dmytriyenko wrote:
> On Thu, Jun 13, 2024 at 04:18:16PM -0500, Ryan Eatmon wrote:
> >
> >
> > On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
> > >From: Denys Dmytriyenko <denys@konsulko.com>
> > >
> > >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 <denys@konsulko.com>
> >
> >
> >
> > >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_DEFAULT_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_DEFAULT_BSP ??= "ti-6_6"
> >
> > Should this variable be named TI_DEFAULT_BSP? That implies that
> > this is the value of the default for this feature. But in reality
> > this variable is what chooses the TI BSP version. Should it be
> > something like TI_BSP_VERSION instead?
>
> It's not just the version, it's entire BSP stack. E.g. "mainline" vs. "bb_org"
> Initially I started with only 2 options - "ti" vs. "bb_org", but eventually
> expanded it to support "mainline" and in case of "ti" also different LTS
> versions - "ti-6_1" and "ti-6_6"... Hence the original name stayed. And not
> sure how long both LTS versions will be supported in meta-ti...
>
> Anyway, I'm fine changing it to something else, but I thing calling it
> "version" will be more confusing.
How about TI_PREFERRED_BSP or something along those lines?
--
Denys
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers
2024-06-14 18:55 ` Denys Dmytriyenko
@ 2024-06-14 19:29 ` Ryan Eatmon
0 siblings, 0 replies; 17+ messages in thread
From: Ryan Eatmon @ 2024-06-14 19:29 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Denys Dmytriyenko
On 6/14/2024 1:55 PM, Denys Dmytriyenko wrote:
> On Fri, Jun 14, 2024 at 12:34:23PM -0400, Denys Dmytriyenko wrote:
>> On Thu, Jun 13, 2024 at 04:18:16PM -0500, Ryan Eatmon wrote:
>>>
>>>
>>> On 6/13/2024 12:22 PM, Denys Dmytriyenko wrote:
>>>> From: Denys Dmytriyenko <denys@konsulko.com>
>>>>
>>>> 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 <denys@konsulko.com>
>>>
>>>
>>>
>>>> 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_DEFAULT_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_DEFAULT_BSP ??= "ti-6_6"
>>>
>>> Should this variable be named TI_DEFAULT_BSP? That implies that
>>> this is the value of the default for this feature. But in reality
>>> this variable is what chooses the TI BSP version. Should it be
>>> something like TI_BSP_VERSION instead?
>>
>> It's not just the version, it's entire BSP stack. E.g. "mainline" vs. "bb_org"
>> Initially I started with only 2 options - "ti" vs. "bb_org", but eventually
>> expanded it to support "mainline" and in case of "ti" also different LTS
>> versions - "ti-6_1" and "ti-6_6"... Hence the original name stayed. And not
>> sure how long both LTS versions will be supported in meta-ti...
>>
>> Anyway, I'm fine changing it to something else, but I thing calling it
>> "version" will be more confusing.
>
> How about TI_PREFERRED_BSP or something along those lines?
I like that.
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants
2024-06-14 16:38 ` Denys Dmytriyenko
@ 2024-06-17 14:01 ` Limaye, Aniket
2024-06-17 15:48 ` Denys Dmytriyenko
0 siblings, 1 reply; 17+ messages in thread
From: Limaye, Aniket @ 2024-06-17 14:01 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Francis, Neha, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 4829 bytes --]
On 6/14/2024 10:08 PM, Denys Dmytriyenko wrote:
> On Fri, Jun 14, 2024 at 03:50:14PM +0530, Aniket Limaye via lists.yoctoproject.org wrote:
>> Hi Denys,
>>
>> On 6/13/2024 10:52 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko<denys@ konsulko. com> 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<denys@ konsulko. com> ---
>>> meta-ti-bsp/conf/machine/include/j721e. inc
>>> ZjQcmQRYFpfptBannerStart
>>> From: Denys Dmytriyenko<denys@konsulko.com>
>>> 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<denys@konsulko.com>
>>> ---
>> Same change is needed for J7200 as well. At the current commit
>> pointed by u-boot-ti-mainline [1], j7200 only has support for below:
>> GP , SR2.0 HS-FS , SR2.0 HS-SE
>>
>> Hence also suggest below for j7200.inc:
>>
>> diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc
>> b/meta-ti-bsp/conf/machine/include/j7200.inc
>> index caa79876..2a11e3dd 100644
>> --- a/meta-ti-bsp/conf/machine/include/j7200.inc
>> +++ b/meta-ti-bsp/conf/machine/include/j7200.inc
>> @@ -5,10 +5,14 @@ SOC_FAMILY:append = ":j7200"
>> IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
>>
>> # Since default tiboot3.bin on J7200 is for GP, add a version for
>> SR1.0 HS-FS
>> -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"
>> +IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
>> +IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
>> +IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
>>
>> # Since default tiboot3.bin on J7200 is for GP, add a version for
>> SR1.0 HS-SE
>> -IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin"
>> +IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
>> +IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
>> +IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
>>
>> # Since default tiboot3.bin on J7200 is for GP, add a version for
>> SR2.0 HS-FS
>> IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
>>
>>
>> [1]:https://source.denx.de/u-boot/u-boot/-/blob/866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e/arch/arm/dts/k3-j7200-binman.dtsi
> Thanks! Patches are welcome.
>
> It wasn't possible for me to test all platforms for all 4 supported "BSPs" - I
> only focused on all Beagles and few EVMs, so some could have been missed,
> especially for the "mainline" BSP.
Denys,
Yeah that makes sense... was only wondering if you'd want to send the
patch in the same series...
I see your v2 though... will send patches for other platforms for
Jacinto based on that.
Btw, I forgot to mention earlier but I like the rework being done in the
patch!
Thanks,
Aniket
>
>
>>> 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"
>>> --
>>> 2.25.1
[-- Attachment #2: Type: text/html, Size: 6106 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-ti] [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants
2024-06-17 14:01 ` Limaye, Aniket
@ 2024-06-17 15:48 ` Denys Dmytriyenko
0 siblings, 0 replies; 17+ messages in thread
From: Denys Dmytriyenko @ 2024-06-17 15:48 UTC (permalink / raw)
To: Limaye, Aniket; +Cc: meta-ti, Francis, Neha, Denys Dmytriyenko
On Mon, Jun 17, 2024 at 07:31:59PM +0530, Limaye, Aniket wrote:
>
> On 6/14/2024 10:08 PM, Denys Dmytriyenko wrote:
> >On Fri, Jun 14, 2024 at 03:50:14PM +0530, Aniket Limaye via lists.yoctoproject.org wrote:
> >>Hi Denys,
> >>
> >>On 6/13/2024 10:52 PM, Denys Dmytriyenko wrote:
> >>>From: Denys Dmytriyenko<denys@ konsulko. com> 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<denys@ konsulko. com> ---
> >>>meta-ti-bsp/conf/machine/include/j721e. inc
> >>>ZjQcmQRYFpfptBannerStart
> >>>From: Denys Dmytriyenko<denys@konsulko.com>
> >>>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<denys@konsulko.com>
> >>>---
> >>Same change is needed for J7200 as well. At the current commit
> >>pointed by u-boot-ti-mainline [1], j7200 only has support for below:
> >>GP , SR2.0 HS-FS , SR2.0 HS-SE
> >>
> >>Hence also suggest below for j7200.inc:
> >>
> >>diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc
> >>b/meta-ti-bsp/conf/machine/include/j7200.inc
> >>index caa79876..2a11e3dd 100644
> >>--- a/meta-ti-bsp/conf/machine/include/j7200.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
> >>@@ -5,10 +5,14 @@ SOC_FAMILY:append = ":j7200"
> >> IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
> >>
> >> # Since default tiboot3.bin on J7200 is for GP, add a version for
> >>SR1.0 HS-FS
> >>-IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"
> >>+IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
> >>+IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
> >>+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
> >>
> >> # Since default tiboot3.bin on J7200 is for GP, add a version for
> >>SR1.0 HS-SE
> >>-IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin"
> >>+IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
> >>+IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
> >>+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
> >>
> >> # Since default tiboot3.bin on J7200 is for GP, add a version for
> >>SR2.0 HS-FS
> >> IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
> >>
> >>
> >>[1]:https://source.denx.de/u-boot/u-boot/-/blob/866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e/arch/arm/dts/k3-j7200-binman.dtsi
> >Thanks! Patches are welcome.
> >
> >It wasn't possible for me to test all platforms for all 4 supported "BSPs" - I
> >only focused on all Beagles and few EVMs, so some could have been missed,
> >especially for the "mainline" BSP.
>
> Denys,
>
> Yeah that makes sense... was only wondering if you'd want to send
> the patch in the same series...
> I see your v2 though... will send patches for other platforms for
> Jacinto based on that.
Yeah, v2 was a simple variable rename - I didn't do any additional changes.
> Btw, I forgot to mention earlier but I like the rework being done in
> the patch!
Thanks.
> >>> 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"
> >>>--
> >>>2.25.1
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-06-17 15:48 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-13 17:22 [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 2/4] conf/machine/j721e: some BSPs don't support all SR and HS variants Denys Dmytriyenko
2024-06-14 10:20 ` [EXTERNAL] [meta-ti] " Limaye, Aniket
2024-06-14 16:38 ` Denys Dmytriyenko
2024-06-17 14:01 ` Limaye, Aniket
2024-06-17 15:48 ` Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 3/4] conf/machine/beagle*, linux-bb.org: update for multi-BSP support Denys Dmytriyenko
2024-06-13 17:22 ` [master/scarthgap][PATCH 4/4] conf/machine: use the default TI BSP for BeaglePlay Denys Dmytriyenko
2024-06-13 19:29 ` [meta-ti] [master/scarthgap][PATCH 1/4] conf/machine, ti-bsp: add support for multiple BSP providers Ryan Eatmon
2024-06-13 19:47 ` Denys Dmytriyenko
2024-06-13 21:09 ` Ryan Eatmon
2024-06-14 17:20 ` Denys Dmytriyenko
2024-06-13 21:18 ` Ryan Eatmon
2024-06-14 6:27 ` [EXTERNAL] " Chirag Shilwant
2024-06-14 16:34 ` Denys Dmytriyenko
[not found] ` <17D8EC1D0CB8CAB1.25108@lists.yoctoproject.org>
2024-06-14 18:55 ` Denys Dmytriyenko
2024-06-14 19:29 ` Ryan Eatmon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.