1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-01-12 01:20:20 +00:00

Compare commits

...

11 Commits

Author SHA1 Message Date
LCPD Automation Script
05609ed6e6 CI/CD Auto-Merger: cicd.scarthgap.202503131348
Updated the value(s) for:
  ti-linux-fw: PRUETH_FW_AM65X_SR2_VERSION,TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION
  atf: SRCREV_tfa
  u-boot-ti-staging_2025.01: SRCREV
  linux-ti-staging_6.12: SRCREV

Changelogs:
  ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=e089c2f8db0577aa4acd3b3ef3ab229be2e804e1..1faf5974a93eb35ac31ed27e5693739edb08824c
  u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=baf3aaa8ecfa20b9d9f497621b6c11915223f502..c8badfb165815c648052309418987f302e48aeef
  linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=1a22c2fb64485a5dea9a9247eb007ddd4ea8a81d..8c8cc002ab65149491f9b75cadfaeb2342150800

Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
2025-03-13 13:48:56 -05:00
Randolph Sapp
b84e1133eb ti-img-rogue-umlibs: ship module blacklist
Well, this is the evil vendor driver. Time to start acting like it.
Blacklist the upstream powervr module if this driver is present.

This patch also does away with the bin_package components. It was cool
and found some interesting bugs, but we might as well start leveraging
that Makefile more now that we're starting to get some more common
files between devices.

Signed-off-by: Randolph Sapp <rs@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-12 19:17:41 -05:00
Brandon Brnich
9cc9b341e6 ti-bsp: ti-img-encode-decode: Out-of-Tree Recipe Cleanup
Module recipe is missing SUMMARY and a proper SRC_URI leading to
warnings during the build process.

Fixes: 296344c8 ("ti-bsp: ti-img-encode-decode: Add Recipe for Building VXE-VXD Out-of-Tree Module")
Reported-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Brandon Brnich <b-brnich@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-12 19:17:41 -05:00
Ryan Eatmon
d463bb8f5a conf: machine: j721e: Add BSP support for new out of tree module
The new out of tree module ti-vxe-vxd-driver is only for the 6.12 kernel
and later.  Since we support multiple BSPs we need to correctly wrap
this addition behind some additional logic that can make sure to not
include it for the 6.1 and 6.6 kernel builds where the module is still
in the tree.

Additionally, fix up the beaglebone-ai64 since it includes the j721e.inc
file and will need to clear this variable for its BSPs as well.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-12 19:17:41 -05:00
Ryan Eatmon
218599d1e7 ti-rpmsg-char: Change to COMPATIBLE_MACHINE
Rather than using COMPATIBLE_HOST move to using COMPATIBLE_MACHINE to
limit the recipe to being TI specific.  Also, this package is "k3"
specific so further limit it down to just those matching machines and
not all TI SOCs.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-12 19:17:41 -05:00
Ryan Eatmon
a543f0e0a1 conf: machine: j721s2/j784s4: Fix overlays for DS90UB954
The previous commit incorrectly added the k3-j721s2-evm-ub954.dtbo to
the KERNEL_DEVICETREE and it was missed during a quick review.

The correct way to add dtbs is to add a prefix string to the
KERNEL_DEVICETREE_PREFIX variable so that all files that match the
string will be picked up.  This allows for multiple kernels to be
swapped out that may have different DTBs in their respective trees and
not break a build.

The upstream testing on the kernel will automatically update the
KERNEL_DEVICETREE variable when the final kernel version is available.
That way the KERNEL_DEVICETREE always points to what is available in the
mainline.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-11 11:25:24 -05:00
Ryan Eatmon
d0ff940a0e conf: machine: j721e: Fix overlays for DS90UB954
The previous commit incorrectly added the k3-j721e-evm-ub954.dtbo to
the KERNEL_DEVICETREE and it was missed during a quick review.

The correct way to add dtbs is to add a prefix string to the
KERNEL_DEVICETREE_PREFIX variable so that all files that match the
string will be picked up.  This allows for multiple kernels to be
swapped out that may have different DTBs in their respective trees and
not break a build.

The upstream testing on the kernel will automatically update the
KERNEL_DEVICETREE variable when the final kernel version is available.
That way the KERNEL_DEVICETREE always points to what is available in the
mainline.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-11 11:25:24 -05:00
LCPD Automation Script
ed05150b00 CI/CD Auto-Merger: cicd.scarthgap.202503070400
Updated the value(s) for:
  ti-linux-fw: TI_DM_FW_VERSION,TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION
  u-boot-ti-staging_2025.01: SRCREV
  linux-ti-staging_6.12: PV,SRCREV

Changelogs:
  ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=6bdfa48f6006e9b4a39befb613ad2a46d0f8746e..e089c2f8db0577aa4acd3b3ef3ab229be2e804e1
  u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=9a3137c5c11a02fef9f2b66a7e9cb2af6a6a15ba..baf3aaa8ecfa20b9d9f497621b6c11915223f502
  linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=1a2d611ee02d63eda3ad6d636e1b0cbf5af87b95..1a22c2fb64485a5dea9a9247eb007ddd4ea8a81d

Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
2025-03-07 04:00:10 -06:00
Brandon Brnich
fe135f34f2 conf: machine: J721e: Add Dependency for IMG Driver
IMG codec drivers reside only on the J721e SoC. Ensure that the drivers
are being built when building SDK.

Signed-off-by: Brandon Brnich <b-brnich@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-06 15:35:42 -06:00
Brandon Brnich
296344c8ea ti-bsp: ti-img-encode-decode: Add Recipe for Building VXE-VXD Out-of-Tree Module
During 10.0 LTS bringup, the decision was made that it would be the last LTS
that carried the IMG VXE and VXD driver in tree. Driver is now hosted on
git.ti.com. This recipe is responsible for pulling in the driver,
building it, and packaging it within the J721e SDK.

Signed-off-by: Brandon Brnich <b-brnich@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-06 15:35:42 -06:00
Bryan Brattlof
9656b79cb5 conf: machine: k3: disable all fit signing for uboot
All K3 SoCs utilize the binman packaging tools in U-Boot to package
and sign the different boot firmware components needed to boot the
various security variants of K3 platform. Disable UBOOT_SIGN_ENABLE
to simplify the build

Signed-off-by: Bryan Brattlof <bb@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2025-03-03 09:42:09 -06:00
13 changed files with 59 additions and 26 deletions

View File

@@ -46,3 +46,9 @@ ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
"
MACHINE_GUI_CLASS = "bigscreen"
# TI has moved a driver out of its kernel tree and into an out of tree module.
# We need to not include that for older kernels since the module is still in
# the kernel.
TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = ""
TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = ""

View File

@@ -36,4 +36,8 @@ TFA_BOARD = "generic"
OPTEEMACHINE = "k3-j721e"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"
TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver"
TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""
TI_VXE_VXD_DRIVER:bsp-ti-6_1 = ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ${TI_VXE_VXD_DRIVER}"

View File

@@ -25,10 +25,6 @@ SPL_BINARY = "tispl.bin"
SPL_BINARYNAME = "tispl.bin"
UBOOT_SUFFIX = "img"
UBOOT_SIGN_ENABLE = "1"
UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
UBOOT_SIGN_KEYNAME ?= "custMpk"
UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
FIT_HASH_ALG ?= "sha512"
FIT_SIGN_ALG ?= "rsa4096"

View File

@@ -19,7 +19,6 @@ KERNEL_DEVICETREE = " \
ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
ti/k3-j721e-sk.dtb \
ti/k3-j721e-evm-ub954.dtbo \
"
UBOOT_MACHINE = "j721e_evm_a72_config"

View File

@@ -20,7 +20,6 @@ KERNEL_DEVICETREE = " \
ti/k3-j721s2-common-proc-board.dtb \
ti/k3-j721s2-evm-gesi-exp-board.dtbo \
ti/k3-j721s2-evm-pcie1-ep.dtbo \
ti/k3-j721s2-evm-ub954.dtbo \
"
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"

View File

@@ -13,6 +13,7 @@ KERNEL_DEVICETREE_PREFIX = " \
ti/k3-j7200-evm-mcspi-loopback \
ti/k3-j721s2-evm-csi2-ov5640 \
ti/k3-j721s2-evm-fusion \
ti/k3-j721s2-evm-ub954 \
ti/k3-am69-sk \
ti/k3-v3link \
"
@@ -23,7 +24,6 @@ KERNEL_DEVICETREE = " \
ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
ti/k3-j784s4-evm.dtb \
ti/k3-j721s2-evm-ub954.dtbo \
"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"

View File

@@ -0,0 +1,23 @@
SUMMARY = "Kernel drivers for Video Accelerators found in the J721E TI SoC"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://README;beginline=11;endline=12;md5=ad10b552e357ac443ec5dd2e02912b1b"
inherit module
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "j721e"
DEPENDS += "virtual/kernel"
BRANCH = "scarthgap/k${PV}"
SRC_URI = "git://git.ti.com/git/multimedia/img-vxe-vxd.git;protocol=https;branch=${BRANCH}"
SRCREV = "99d063aa0ef53633057042570411b84bd967624b"
TARGET_PRODUCT:j721e = "j721e_linux"
S = "${WORKDIR}/git"
EXTRA_OEMAKE += 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'

View File

@@ -9,15 +9,15 @@ INC_PR = "r4"
# Firmware versions
CORESDK_RTOS_VERSION = "08.02.00.04"
PRUETH_FW_AM65X_VERSION = "08.00.00.20"
PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.02"
PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.04"
GOODIX_FW_VERSION = "1.0.0.0"
CADENCE_MHDP_FW_VERSION = "2.1.0"
IMG_DEC_FW_VERSION = "1.0"
CNM_WAVE521_FW_VERSION = "1.0.7"
TI_DM_FW_VERSION = "10.01.03"
TI_SYSFW_VERSION = "11.00.02"
TI_DM_FW_VERSION = "11.00.06"
TI_SYSFW_VERSION = "11.00.07"
TI_LINUX_FW_SRCREV ?= "6bdfa48f6006e9b4a39befb613ad2a46d0f8746e"
TI_LINUX_FW_SRCREV ?= "1faf5974a93eb35ac31ed27e5693739edb08824c"
SRCREV = "${TI_LINUX_FW_SRCREV}"
BRANCH ?= "ti-linux-firmware"

View File

@@ -1,7 +1,7 @@
# NOTE: This .inc file with customizations only gets included for K3 platforms
PV = "2.12+git"
SRCREV_tfa = "dd46885ec58f9394b37f0c3d957e79838999b79d"
SRCREV_tfa = "2ae655f0f77a540c2b935780cccb1f150350f84f"
SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
SRCBRANCH = "ti-master"
SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"

View File

@@ -6,4 +6,4 @@ PR = "r0"
BRANCH = "ti-u-boot-2025.01"
SRCREV = "9a3137c5c11a02fef9f2b66a7e9cb2af6a6a15ba"
SRCREV = "c8badfb165815c648052309418987f302e48aeef"

View File

@@ -3,19 +3,15 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
LICENSE = "TI-TFL"
LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
inherit bin_package
INHIBIT_DEFAULT_DEPS = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
PR = "r3"
PR = "r4"
BRANCH = "linuxws/scarthgap/k6.12/${PV}"
SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
SRCREV = "d578666fc6ecd09f7d6c3431747f1d93d128fe28"
S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
SRCREV = "1ed9ee185cd876200e6747192854015b8e94a7b0"
S = "${WORKDIR}/git"
TARGET_PRODUCT:j721e = "j721e_linux"
TARGET_PRODUCT:j721s2 = "j721s2_linux"
@@ -54,7 +50,12 @@ def get_file_list(package_list_var, d):
file_list.append(f"{prefix}{package_file}")
return " ".join(file_list)
do_install:append() {
EXTRA_OEMAKE += 'BUILD=${PVR_BUILD} TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install() {
oe_runmake 'DESTDIR=${D}' install
if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then
for file in ${@get_file_list('GLES_PACKAGES', d)}; do
rm -rf ${file}
@@ -78,6 +79,9 @@ do_install:append() {
# clean up any empty directories
find "${D}" -empty -type d -delete
# fix permissions
chown -R root:root "${D}"
}
GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
@@ -141,6 +145,9 @@ INSANE_SKIP:${PN}-tools = "ldflags"
FILES:${PN}-firmware = "${base_libdir}/firmware/*"
INSANE_SKIP:${PN}-firmware += "arch"
# common libraries
FILES:${PN} = "${libdir}"
RRECOMMENDS:${PN} += " \
${PN}-tools \
"

View File

@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
BRANCH ?= "ti-linux-6.12.y"
SRCREV ?= "1a2d611ee02d63eda3ad6d636e1b0cbf5af87b95"
PV = "6.12.13+git"
SRCREV ?= "8c8cc002ab65149491f9b75cadfaeb2342150800"
PV = "6.12.17+git"
# Special configuration for remoteproc/rpmsg IPC modules
module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"

View File

@@ -14,5 +14,4 @@ PV = "0.6.7+git"
S = "${WORKDIR}/git"
COMPATIBLE_HOST ?= "null"
COMPATIBLE_HOST:ti-soc = "(.*)"
COMPATIBLE_MACHINE = "^(k3)$"