mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-01-12 01:20:20 +00:00
Code Issues Projects Releases Wiki Activity

ti-extras: Clean up

Browse Source 
The TI_EXTRAS infrastructure needs a little tweaking to support turning
on multiple extra options at the same time.

1) Since TI_EXTRAS can be a space separated list and not a single fixed
value, we need to change how we detect when to include the TI_EXTRA
values.

2) The tie-jailhouse overrides were being a little too heavy handed.
All of the variables that are changed for any given extra feature needs
to use the proper variable override.  This was most important for the
COMPATIBLE_MACHINE settings.

3) Move the ti-extras out of specific machine configs and into the
ti-soc so that all machines can use the extras.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Ryan Eatmon
2025-09-22 09:14:07 -05:00
parent d99cff5534
commit 3dda9db492
12 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta-ti-bsp/conf/machine/am62lxx-evm.conf
View File

@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI AM62L EVM
require conf/machine/include/am62lxx.inc
require conf/machine/include/ti-extras.inc
IMAGE_FSTYPES += "ubifs ubi"

1
meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
View File

@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI AM62Px EVM (R5F core)
require conf/machine/include/k3r5.inc
require conf/machine/include/ti-extras.inc
SYSFW_SOC = "am62px"
SYSFW_CONFIG = "evm"

1
meta-ti-bsp/conf/machine/am62pxx-evm.conf
View File

@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI AM62PX EVM
require conf/machine/include/am62pxx.inc
require conf/machine/include/ti-extras.inc
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am62p5 \

1
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
View File

@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
require conf/machine/include/k3r5.inc
require conf/machine/include/ti-extras.inc
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"

1
meta-ti-bsp/conf/machine/am62xx-evm.conf
View File

@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI AM62XX EVM
require conf/machine/include/am62xx.inc
require conf/machine/include/ti-extras.inc
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am625 \

1
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
View File

@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
require conf/machine/include/k3r5.inc
require conf/machine/include/ti-extras.inc
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"

1
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
View File

@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
require conf/machine/include/am62xx.inc
require conf/machine/include/ti-extras.inc
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am62-lp \

2
meta-ti-bsp/conf/machine/include/ti-extras.inc
View File

@@ -1,4 +1,4 @@
# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
TI_EXTRAS ??= ""
MACHINEOVERRIDES =. "${@ '${TI_EXTRAS}:' if d.getVar('TI_EXTRAS').startswith('tie-') else ''}"
MACHINEOVERRIDES =. "${@ ':'.join('${TI_EXTRAS}'.strip().split()) + ':' if d.getVar('TI_EXTRAS') else ''}"

1
meta-ti-bsp/conf/machine/include/ti-soc.inc
View File

@@ -2,6 +2,7 @@
# and platforms defined in meta-ti to allow BSP-level overrides.
SOC_FAMILY = "ti-soc"
require conf/machine/include/soc-family.inc
require conf/machine/include/ti-extras.inc
# kernel, initrd load addresses for the fitImage in all TI platforms
UBOOT_ENTRYPOINT = "0x82000000"

16
meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
View File

@@ -1,12 +1,10 @@
#
# Jailhouse settings
#
COMPATIBLE_MACHINE:tie-jailhouse = "am62xx|am62pxx|am62lxx"
# This will have priority over generic uboot path
BRANCH:tie-jailhouse:bsp-ti-6_12 = "ti-u-boot-2025.01-jailhouse"
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
SRCREV:tie-jailhouse:bsp-ti-6_12 = "e718bbcec3ebf663c021839753034a224be4cc53"
BRANCH = "ti-u-boot-2025.01"
BRANCH:tie-jailhouse = "ti-u-boot-2025.01-jailhouse"
SRCREV = "e718bbcec3ebf663c021839753034a224be4cc53"
SRCREV:tie-jailhouse = "e718bbcec3ebf663c021839753034a224be4cc53"
UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
UBOOT_GIT_URI:tie-jailhouse = "git://git.ti.com/git/processor-sdk/u-boot.git"

15
meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
View File

@@ -1,11 +1,6 @@
#
# Jailhouse settings
#
BRANCH:tie-jailhouse:bsp-ti-6_12 = "ti-linux-6.12.y-jailhouse"
# Use different commit, repo and branch for TI extras build
# This will have priority over generic rt path
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
BRANCH = "ti-linux-6.12.y"
BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
SRCREV:tie-jailhouse:bsp-ti-6_12 = "229a48602ad1557612a4ffabec6a3cbcdd745f87"

16
meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
View File

@@ -1,14 +1,12 @@
# Use different commit, repo and branch for TI extras build
# This will have priority over generic rt path
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
#
# Jailhouse settings
#
COMPATIBLE_MACHINE:tie-jailhouse = "am62xx|am62pxx|am62lxx"
BRANCH = "ti-linux-6.12.y"
BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
BRANCH:tie-jailhouse:bsp-ti-6_12 = "ti-linux-6.12.y-jailhouse"
SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git"
SRCREV:tie-jailhouse:bsp-ti-6_12 = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
KERNEL_GIT_URI:tie-jailhouse = "git://git.ti.com/git/processor-sdk/linux.git"