mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-04-17 18:19:37 +00:00
Compare commits
30 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed05150b00 | ||
|
|
fe135f34f2 | ||
|
|
296344c8ea | ||
|
|
9656b79cb5 | ||
|
|
d1f9c4761e | ||
|
|
aa7b8ba862 | ||
|
|
4be00f8b4c | ||
|
|
33e405f914 | ||
|
|
bacda37227 | ||
|
|
c5808a1c56 | ||
|
|
d8bd791c0f | ||
|
|
d4eb2d80f0 | ||
|
|
736916f8ac | ||
|
|
6c69db8d0d | ||
|
|
86be40194a | ||
|
|
f319cc58fd | ||
|
|
48e2fa7e2b | ||
|
|
e6a3d51f45 | ||
|
|
654055354f | ||
|
|
3b2097d727 | ||
|
|
b9fa8305d3 | ||
|
|
95a84e434b | ||
|
|
b8aaaebbab | ||
|
|
211b4b46b0 | ||
|
|
969eaa1303 | ||
|
|
c4b39ba6af | ||
|
|
31153f722b | ||
|
|
2d0978193c | ||
|
|
13b691a9bc | ||
|
|
0261a91978 |
@@ -43,7 +43,7 @@ BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
|
||||
BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
|
||||
BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
|
||||
BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
|
||||
BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "23%"
|
||||
BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"
|
||||
|
||||
# GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
|
||||
MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320"
|
||||
|
||||
20
meta-ti-bsp/conf/machine/am62lxx-evm.conf
Normal file
20
meta-ti-bsp/conf/machine/am62lxx-evm.conf
Normal file
@@ -0,0 +1,20 @@
|
||||
#@TYPE: Machine
|
||||
#@NAME: AM62L EVM
|
||||
#@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"
|
||||
|
||||
MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8000"
|
||||
|
||||
UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
|
||||
|
||||
KERNEL_DEVICETREE_PREFIX = " \
|
||||
ti/k3-am62l \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE = ""
|
||||
|
||||
UBOOT_MACHINE = "am62lx_evm_defconfig"
|
||||
12
meta-ti-bsp/conf/machine/include/am62lxx.inc
Normal file
12
meta-ti-bsp/conf/machine/include/am62lxx.inc
Normal file
@@ -0,0 +1,12 @@
|
||||
require conf/machine/include/k3.inc
|
||||
SOC_FAMILY:append = ":am62lxx"
|
||||
|
||||
MACHINE_FEATURES += "screen"
|
||||
|
||||
# Default tiboot3.bin on AM62L is for HS-FS
|
||||
IMAGE_BOOT_FILES += "tiboot3-am62lx-hs-fs-evm.bin"
|
||||
|
||||
TFA_BOARD = "am62l"
|
||||
TFA_K3_SYSTEM_SUSPEND = "1"
|
||||
|
||||
OPTEEMACHINE = "k3-am62lx"
|
||||
@@ -34,3 +34,5 @@ TFA_BOARD = "lite"
|
||||
OPTEEMACHINE = "k3-am64x"
|
||||
|
||||
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"
|
||||
|
||||
TI_WKS_BOOTLOADER_APPEND="console=ttyS2,115200n8"
|
||||
|
||||
@@ -36,4 +36,4 @@ TFA_BOARD = "generic"
|
||||
|
||||
OPTEEMACHINE = "k3-j721e"
|
||||
|
||||
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"
|
||||
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ti-vxe-vxd-driver"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -55,6 +51,8 @@ MACHINE_FEATURES += "efi"
|
||||
|
||||
WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
|
||||
|
||||
TI_WKS_BOOTLOADER_APPEND ?= ""
|
||||
|
||||
do_image_wic[depends] += "virtual/bootloader:do_deploy"
|
||||
|
||||
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
|
||||
|
||||
@@ -50,9 +50,13 @@ BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%"
|
||||
BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging"
|
||||
BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
|
||||
|
||||
# GPU support requires out-of-tree SGX and Rogue drivers not available
|
||||
# in 6.12 yet
|
||||
MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu"
|
||||
BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
|
||||
BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
|
||||
BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%"
|
||||
BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
|
||||
BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%"
|
||||
BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%"
|
||||
BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"
|
||||
|
||||
# GC320 support requires out-of-tree drivers not yet available in 6.12
|
||||
MACHINE_FEATURES:remove:bsp-ti-6_12 = "gc320"
|
||||
@@ -72,7 +76,7 @@ BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
|
||||
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%"
|
||||
BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"
|
||||
|
||||
# GC320 support requires out-of-tree drivers not yet available in 6.6
|
||||
MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320"
|
||||
|
||||
@@ -19,6 +19,7 @@ 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"
|
||||
|
||||
@@ -20,6 +20,7 @@ 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"
|
||||
|
||||
@@ -7,6 +7,7 @@ require conf/machine/include/j722s.inc
|
||||
KERNEL_DEVICETREE_PREFIX = " \
|
||||
ti/k3-j722s \
|
||||
ti/k3-fpdlink \
|
||||
ti/k3-am625-sk-mcspi-loopback \
|
||||
ti/k3-v3link \
|
||||
"
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ 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"
|
||||
|
||||
@@ -13,13 +13,13 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
|
||||
|
||||
DEPENDS = "virtual/kernel"
|
||||
|
||||
BRANCH = "linuxws/scarthgap/k6.6/${PV}"
|
||||
BRANCH = "linuxws/scarthgap/k6.12/${PV}"
|
||||
|
||||
SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRCREV = "707bb373902babf9ced5fd2f99139209ca0f605a"
|
||||
SRCREV = "023eb5afde7e069bff1e5e37620b84a66b447936"
|
||||
|
||||
TARGET_PRODUCT:j721e = "j721e_linux"
|
||||
TARGET_PRODUCT:j721s2 = "j721s2_linux"
|
||||
@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRCREV = "3005cf8145a6720daa47e4e273f9e421ff77cb58"
|
||||
SRCREV = "f555b9e1ae4b2baf68ac778ca41dc0c17e96f89a"
|
||||
|
||||
TARGET_PRODUCT:omap-a15 = "ti572x_linux"
|
||||
TARGET_PRODUCT:ti33x = "ti335x_linux"
|
||||
|
||||
@@ -31,6 +31,7 @@ PLAT_SFX:am65xx = "am65xx"
|
||||
PLAT_SFX:am64xx = "am64xx"
|
||||
PLAT_SFX:am62xx = "am62xx"
|
||||
PLAT_SFX:am62axx = "am62axx"
|
||||
PLAT_SFX:am62lxx = "am62lxx"
|
||||
PLAT_SFX:am62pxx = "am62pxx"
|
||||
|
||||
DM_FW_DIR = "ti-dm/${PLAT_SFX}"
|
||||
@@ -50,6 +51,7 @@ DM_FW_LIST:am65xx = ""
|
||||
DM_FW_LIST:am64xx = ""
|
||||
DM_FW_LIST:am62xx = "${DM_FIRMWARE}"
|
||||
DM_FW_LIST:am62axx = "${DM_FIRMWARE}"
|
||||
DM_FW_LIST:am62lxx = ""
|
||||
DM_FW_LIST:am62pxx = "${DM_FIRMWARE}"
|
||||
|
||||
do_install() {
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
DESCRIPTION = "Kernel drivers for the VXE384 and D5500 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/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}"'
|
||||
@@ -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.00"
|
||||
PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.02"
|
||||
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 = "10.01.08"
|
||||
TI_DM_FW_VERSION = "11.00.06"
|
||||
TI_SYSFW_VERSION = "11.00.06"
|
||||
|
||||
TI_LINUX_FW_SRCREV ?= "7fbc75f80161a400a4b9c618b6191d72ab408def"
|
||||
TI_LINUX_FW_SRCREV ?= "e089c2f8db0577aa4acd3b3ef3ab229be2e804e1"
|
||||
SRCREV = "${TI_LINUX_FW_SRCREV}"
|
||||
|
||||
BRANCH ?= "ti-linux-firmware"
|
||||
|
||||
@@ -26,4 +26,10 @@ do_deploy:k3r5() {
|
||||
install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${DEPLOYDIR}/ti-sysfw
|
||||
}
|
||||
|
||||
do_deploy:am62lxx(){
|
||||
install -d ${DEPLOYDIR}/ti-sysfw
|
||||
install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw
|
||||
install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw
|
||||
}
|
||||
|
||||
addtask deploy before do_build after do_compile
|
||||
|
||||
@@ -1,11 +1,21 @@
|
||||
PV:k3 = "2.11+git"
|
||||
SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
|
||||
LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
|
||||
SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
|
||||
COMPATIBLE_MACHINE:k3 = "k3"
|
||||
TFA_BUILD_TARGET:k3 = "all"
|
||||
TFA_INSTALL_TARGET:k3 = "bl31"
|
||||
TFA_SPD:k3 = "opteed"
|
||||
# NOTE: This .inc file with customizations only gets included for K3 platforms
|
||||
|
||||
EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
|
||||
EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
|
||||
PV = "2.12+git"
|
||||
SRCREV_tfa = "dd46885ec58f9394b37f0c3d957e79838999b79d"
|
||||
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}"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
|
||||
COMPATIBLE_MACHINE = "k3"
|
||||
|
||||
TFA_BUILD_TARGET = "all"
|
||||
TFA_INSTALL_TARGET = "bl31"
|
||||
TFA_SPD = "opteed"
|
||||
|
||||
# For am62lxx, install bl1 & bl31 using TFA_INSTALL_TARGET
|
||||
TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
|
||||
TFA_SPD:am62lxx = ""
|
||||
|
||||
EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
|
||||
EXTRA_OEMAKE += "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
# This will have priority over generic uboot path
|
||||
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx"
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
|
||||
|
||||
BRANCH = "ti-u-boot-2024.04"
|
||||
BRANCH:tie-jailhouse = "ti-u-boot-2024.04-jailhouse"
|
||||
BRANCH = "ti-u-boot-2025.01"
|
||||
BRANCH:tie-jailhouse = "ti-u-boot-2025.01-jailhouse"
|
||||
|
||||
SRCREV = "b3c10f333acccef49ebaf4abc575616ea7326d50"
|
||||
SRCREV:tie-jailhouse = "b3c10f333acccef49ebaf4abc575616ea7326d50"
|
||||
SRCREV = "e718bbcec3ebf663c021839753034a224be4cc53"
|
||||
SRCREV:tie-jailhouse = "e718bbcec3ebf663c021839753034a224be4cc53"
|
||||
|
||||
UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
|
||||
|
||||
@@ -2,8 +2,8 @@ require u-boot-ti.inc
|
||||
|
||||
SUMMARY = "Mainline U-Boot for TI devices"
|
||||
|
||||
PV = "2024.10"
|
||||
PV = "2025.01"
|
||||
|
||||
UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
|
||||
|
||||
SRCREV = "f919c3a889f0ec7d63a48b5d0ed064386b0980bd"
|
||||
SRCREV = "6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72"
|
||||
|
||||
@@ -6,4 +6,4 @@ PR = "r0"
|
||||
|
||||
BRANCH = "ti-u-boot-2025.01"
|
||||
|
||||
SRCREV = "4e9c90ad8b12cc5b4fdd1308bc3ac3e4fc869aab"
|
||||
SRCREV = "baf3aaa8ecfa20b9d9f497621b6c11915223f502"
|
||||
|
||||
@@ -53,8 +53,10 @@ PLAT_SFX:am65xx = "am65xx"
|
||||
PLAT_SFX:am64xx = "am64xx"
|
||||
PLAT_SFX:am62xx = "am62xx"
|
||||
PLAT_SFX:am62axx = "am62axx"
|
||||
PLAT_SFX:am62lxx = "am62lxx"
|
||||
PLAT_SFX:am62pxx = "am62pxx"
|
||||
|
||||
PACKAGECONFIG[ap-trusted-rom] = "BL1=${STAGING_DIR_HOST}/firmware/bl1.bin,,trusted-firmware-a"
|
||||
PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a"
|
||||
PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os"
|
||||
PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw"
|
||||
@@ -68,6 +70,7 @@ PACKAGECONFIG:append:j722s = " dm"
|
||||
PACKAGECONFIG:append:j742s2 = " dm"
|
||||
PACKAGECONFIG:append:am62xx = " dm"
|
||||
PACKAGECONFIG:append:am62axx = " dm"
|
||||
PACKAGECONFIG:append:am62lxx = " ap-trusted-rom"
|
||||
PACKAGECONFIG:append:am62pxx = " dm"
|
||||
|
||||
COMPATIBLE_MACHINE = "(ti-soc)"
|
||||
@@ -226,6 +229,16 @@ uboot_deploy_config:append:k3r5 () {
|
||||
done
|
||||
}
|
||||
|
||||
uboot_deploy_config:append:am62lxx () {
|
||||
for f in ${B}/${config}/tiboot3-*.bin; do
|
||||
if [ -f "$f" ]; then
|
||||
f_base=$(basename $f)
|
||||
install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
|
||||
ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
uboot_deploy:append:k3r5 () {
|
||||
for f in ${B}/tiboot3-*.bin; do
|
||||
if [ -f "$f" ]; then
|
||||
@@ -240,6 +253,14 @@ uboot_deploy:append:k3r5 () {
|
||||
done
|
||||
}
|
||||
|
||||
uboot_deploy:append:am62lxx () {
|
||||
for f in ${B}/tiboot3*.bin; do
|
||||
if [ -f "$f" ]; then
|
||||
install -m 644 $f ${DEPLOYDIR}/
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
uboot_deploy_config:append () {
|
||||
cd ${DEPLOYDIR}
|
||||
if [ "x${SPL_UART_BINARY}" != "x" ]; then
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Eatmon <reatmon@ti.com>
|
||||
Date: Mon, 4 Nov 2024 13:37:29 -0600
|
||||
Subject: [PATCH] gallium: Fix build with llvm 18 and 19
|
||||
|
||||
- CodeGenOpt::Level changed to CodeGenOoptLevel. [1]
|
||||
- llvm::sys::getHostCPUFeatures() now returns the features instead of
|
||||
modifying the passed in argument. [2]
|
||||
|
||||
Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179]
|
||||
Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
|
||||
|
||||
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
|
||||
---
|
||||
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++--
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
index 5e7a30a6cc2..dbc777e3096 100644
|
||||
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
@@ -366,7 +366,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
|
||||
builder.setEngineKind(EngineKind::JIT)
|
||||
.setErrorStr(&Error)
|
||||
.setTargetOptions(options)
|
||||
+#if LLVM_VERSION_MAJOR >= 18
|
||||
+ .setOptLevel((CodeGenOptLevel)OptLevel);
|
||||
+#else
|
||||
.setOptLevel((CodeGenOpt::Level)OptLevel);
|
||||
+#endif
|
||||
|
||||
#if DETECT_OS_WINDOWS
|
||||
/*
|
||||
@@ -394,8 +398,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
|
||||
* which allows us to enable/disable code generation based
|
||||
* on the results of cpuid on these architectures.
|
||||
*/
|
||||
- llvm::StringMap<bool> features;
|
||||
- llvm::sys::getHostCPUFeatures(features);
|
||||
+ #if LLVM_VERSION_MAJOR >= 19
|
||||
+ /* llvm-19+ returns StringMap from getHostCPUFeatures.
|
||||
+ */
|
||||
+ auto features = llvm::sys::getHostCPUFeatures();
|
||||
+ #else
|
||||
+ llvm::StringMap<bool> features;
|
||||
+ llvm::sys::getHostCPUFeatures(features);
|
||||
+ #endif
|
||||
|
||||
for (StringMapIterator<bool> f = features.begin();
|
||||
f != features.end();
|
||||
--
|
||||
2.17.1
|
||||
@@ -1,42 +0,0 @@
|
||||
From 00d41cd5aa3f4b494dc276c9b4ccdc096310c91f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 28 Sep 2023 15:34:22 -0700
|
||||
Subject: [PATCH] meson: use llvm-config instead of cmake to fix linking errors with meson 1.2.1
|
||||
|
||||
meson dependency auto dependency detection uses cmake and then
|
||||
config-tool to process dependencies, in mesa the logic to detect llvm is
|
||||
using auto detection which means if it finds cmake then it will try to
|
||||
use cmake method. Cmake method works ok except a case when llvm-dev
|
||||
package is installed on the build host then it generates its own
|
||||
native.meson file and ignores OE supplied meson.native file which has
|
||||
correct llvm-config tool specified which is pointing to llvm-config from
|
||||
native sysroot. The generated meson.native file points to one found in
|
||||
/usr/bin and there onwards detector finds native install of llvm and
|
||||
configures that into building native mesa package.
|
||||
|
||||
Since cmake detector does not always work, disable it by default and use
|
||||
config-tool which works in all cases. This is suggested in below issues
|
||||
too
|
||||
|
||||
A similar issue is open in meson upstream [1] and mesa [2]
|
||||
|
||||
[1] https://github.com/mesonbuild/meson/issues/10483
|
||||
[2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/6738
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25438]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
meson.build | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1659,6 +1659,7 @@ with_llvm = false
|
||||
if _llvm.allowed()
|
||||
dep_llvm = dependency(
|
||||
'llvm',
|
||||
+ method : host_machine.system() == 'windows' ? 'auto' : 'config-tool',
|
||||
version : _llvm_version,
|
||||
modules : llvm_modules,
|
||||
optional_modules : llvm_optional_modules,
|
||||
@@ -0,0 +1,38 @@
|
||||
From fa9cd89a85b904615ebc11da609445b5b751e68d Mon Sep 17 00:00:00 2001
|
||||
From: Satadru Pramanik <satadru@umich.edu>
|
||||
Date: Sat, 5 Oct 2024 13:35:52 +0000
|
||||
Subject: [PATCH] Update lp_bld_misc.cpp to support llvm-19+.
|
||||
|
||||
Fixes #11896.
|
||||
cc: mesa-stable
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31533>
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
|
||||
Signed-off-by: Randolph Sapp <rs@ti.com>
|
||||
---
|
||||
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
index 7975fcf1ac9..5b615d627ff 100644
|
||||
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
@@ -329,8 +329,14 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
|
||||
* which allows us to enable/disable code generation based
|
||||
* on the results of cpuid on these architectures.
|
||||
*/
|
||||
- llvm::StringMap<bool> features;
|
||||
- llvm::sys::getHostCPUFeatures(features);
|
||||
+ #if LLVM_VERSION_MAJOR >= 19
|
||||
+ /* llvm-19+ returns StringMap from getHostCPUFeatures.
|
||||
+ */
|
||||
+ auto features = llvm::sys::getHostCPUFeatures();
|
||||
+ #else
|
||||
+ llvm::StringMap<bool> features;
|
||||
+ llvm::sys::getHostCPUFeatures(features);
|
||||
+ #endif
|
||||
|
||||
for (llvm::StringMapIterator<bool> f = features.begin();
|
||||
f != features.end();
|
||||
--
|
||||
2.47.1
|
||||
@@ -0,0 +1,57 @@
|
||||
From 4bd15a419e892da843489c374c58c5b29c40b5d6 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@smile.fr>
|
||||
Date: Tue, 6 Feb 2024 09:47:09 +0100
|
||||
Subject: [PATCH 1/2] drisw: fix build without dri3
|
||||
|
||||
commit 1887368df41 ("glx/sw: check for modifier support in the kopper path")
|
||||
added dri3_priv.h header and dri3_check_multibuffer() function in drisw that
|
||||
can be build without dri3.
|
||||
|
||||
i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver':
|
||||
drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer'
|
||||
collect2: error: ld returned 1 exit status
|
||||
|
||||
Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using
|
||||
dri3_check_multibuffer().
|
||||
|
||||
Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path")
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
|
||||
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/glx/drisw_glx.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
|
||||
index 3d3f752..4b19e2d 100644
|
||||
--- a/src/glx/drisw_glx.c
|
||||
+++ b/src/glx/drisw_glx.c
|
||||
@@ -32,7 +32,9 @@
|
||||
#include <dlfcn.h>
|
||||
#include "dri_common.h"
|
||||
#include "drisw_priv.h"
|
||||
+#ifdef HAVE_DRI3
|
||||
#include "dri3_priv.h"
|
||||
+#endif
|
||||
#include <X11/extensions/shmproto.h>
|
||||
#include <assert.h>
|
||||
#include <vulkan/vulkan_core.h>
|
||||
@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
|
||||
goto handle_error;
|
||||
}
|
||||
|
||||
+#ifdef HAVE_DRI3
|
||||
if (pdpyp->zink) {
|
||||
bool err;
|
||||
psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err);
|
||||
@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
|
||||
goto handle_error;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
glx_config_destroy_list(psc->base.configs);
|
||||
psc->base.configs = configs;
|
||||
--
|
||||
2.44.0
|
||||
@@ -0,0 +1,31 @@
|
||||
From d17338d403980e1932a42f5d11c2a1fb7b25127b Mon Sep 17 00:00:00 2001
|
||||
From: MastaG <mastag@gmail.com>
|
||||
Date: Wed, 3 Jul 2024 21:00:42 +0200
|
||||
Subject: [PATCH] gallivm: Call StringMapIterator from llvm:: scope
|
||||
|
||||
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11392
|
||||
Fixes: b035d9cab5a4 ("gallivm: use getHostCPUFeatures on x86/llvm-4.0+.")
|
||||
Reviewed-by: David Heidelberg <david@ixit.cz>
|
||||
Signed-off-by: David Heidelberg <david@ixit.cz>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30009>
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/d17338d403980e1932a42f5d11c2a1fb7b25127b]
|
||||
Signed-off-by: Randolph Sapp <rs@ti.com>
|
||||
---
|
||||
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
index 95a8a6c6a08..f3c10652ed6 100644
|
||||
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
|
||||
@@ -332,7 +332,7 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
|
||||
llvm::StringMap<bool> features;
|
||||
llvm::sys::getHostCPUFeatures(features);
|
||||
|
||||
- for (StringMapIterator<bool> f = features.begin();
|
||||
+ for (llvm::StringMapIterator<bool> f = features.begin();
|
||||
f != features.end();
|
||||
++f) {
|
||||
MAttrs.push_back(((*f).second ? "+" : "-") + (*f).first().str());
|
||||
--
|
||||
2.47.1
|
||||
@@ -1,4 +1,4 @@
|
||||
From b251af67df5a6840d2e9cc06edae2c387f8778f1 Mon Sep 17 00:00:00 2001
|
||||
From f2fe76d506f356de055b8eca83a7c9d0744a40af Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Francis <alistair@alistair23.me>
|
||||
Date: Thu, 14 Nov 2019 13:04:49 -0800
|
||||
Subject: [PATCH] meson.build: check for all linux host_os combinations
|
||||
@@ -20,24 +20,24 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 22385d8..15f48a6 100644
|
||||
index 35cc5f1..9a49c0d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
|
||||
@@ -128,7 +128,7 @@
|
||||
# Only build shared_glapi if at least one OpenGL API is enabled
|
||||
with_shared_glapi = with_shared_glapi and with_any_opengl
|
||||
|
||||
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system())
|
||||
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux')
|
||||
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system())
|
||||
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
|
||||
|
||||
gallium_drivers = get_option('gallium-drivers')
|
||||
if gallium_drivers.contains('auto')
|
||||
@@ -909,7 +909,7 @@ if cc.has_function('fmemopen')
|
||||
@@ -998,7 +998,7 @@
|
||||
endif
|
||||
|
||||
# TODO: this is very incomplete
|
||||
-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android'].contains(host_machine.system())
|
||||
+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux')
|
||||
-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system())
|
||||
+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
|
||||
pre_args += '-D_GNU_SOURCE'
|
||||
elif host_machine.system() == 'sunos'
|
||||
pre_args += '-D__EXTENSIONS__'
|
||||
@@ -0,0 +1,41 @@
|
||||
From 62495ebb977866c52d5bed8499a547c49f0d9bc1 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@smile.fr>
|
||||
Date: Tue, 6 Feb 2024 09:47:10 +0100
|
||||
Subject: [PATCH 2/2] glxext: don't try zink if not enabled in mesa
|
||||
|
||||
Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
|
||||
added an automatic zink fallback even when the zink gallium is not
|
||||
enabled at build time.
|
||||
|
||||
It leads to unexpected error log while loading drisw driver and
|
||||
zink is not installed on the rootfs:
|
||||
|
||||
MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so
|
||||
|
||||
Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
|
||||
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/glx/glxext.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
|
||||
index 05c825a..7a06aa9 100644
|
||||
--- a/src/glx/glxext.c
|
||||
+++ b/src/glx/glxext.c
|
||||
@@ -908,9 +908,11 @@ __glXInitialize(Display * dpy)
|
||||
#endif /* HAVE_DRI3 */
|
||||
if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false))
|
||||
dpyPriv->dri2Display = dri2CreateDisplay(dpy);
|
||||
+#if defined(HAVE_ZINK)
|
||||
if (!dpyPriv->dri3Display && !dpyPriv->dri2Display)
|
||||
try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) &&
|
||||
!getenv("GALLIUM_DRIVER");
|
||||
+#endif /* HAVE_ZINK */
|
||||
}
|
||||
#endif /* GLX_USE_DRM */
|
||||
if (glx_direct)
|
||||
--
|
||||
2.44.0
|
||||
@@ -15,8 +15,10 @@ SRC_URI = " \
|
||||
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
|
||||
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
|
||||
file://0001-gallium-Fix-build-with-llvm-17.patch \
|
||||
file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \
|
||||
file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \
|
||||
file://0001-drisw-fix-build-without-dri3.patch \
|
||||
file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
|
||||
file://0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch \
|
||||
file://0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -26,19 +28,13 @@ PACKAGECONFIG:append = " \
|
||||
${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "0e75e7ded360ea6aee4140393b30960e152f3994"
|
||||
PV = "23.2.1"
|
||||
SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38"
|
||||
PV = "24.0.1"
|
||||
|
||||
PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
|
||||
PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
|
||||
PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
|
||||
|
||||
PACKAGECONFIG:remove = "video-codecs"
|
||||
PACKAGECONFIG[video-codecs] = ""
|
||||
PACKAGECONFIG:remove = "elf-tls"
|
||||
PACKAGECONFIG[elf-tls] = ""
|
||||
PACKAGECONFIG:remove = "xvmc"
|
||||
PACKAGECONFIG[xvmc] = ""
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
@@ -44,7 +44,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}"
|
||||
def get_file_list(package_list_var, d):
|
||||
file_list = []
|
||||
package_list = d.getVar(package_list_var)
|
||||
prefix = f"{d.getVar('S')}/"
|
||||
prefix = f"{d.getVar('D')}/"
|
||||
if package_list:
|
||||
for package in package_list.split():
|
||||
package_file_string = d.getVar(f"FILES:{package}")
|
||||
@@ -53,7 +53,7 @@ def get_file_list(package_list_var, d):
|
||||
file_list.append(f"{prefix}{package_file}")
|
||||
return " ".join(file_list)
|
||||
|
||||
do_install:prepend() {
|
||||
do_install:append() {
|
||||
if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then
|
||||
for file in ${@get_file_list('GLES_PACKAGES', d)}; do
|
||||
rm -rf ${file}
|
||||
@@ -70,13 +70,13 @@ do_install:prepend() {
|
||||
done
|
||||
fi
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
|
||||
if [ -e ${S}/lib/firmware ]; then
|
||||
mv ${S}/lib/firmware ${S}${nonarch_base_libdir}
|
||||
if [ -e ${D}/lib/firmware ]; then
|
||||
mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
|
||||
fi
|
||||
fi
|
||||
|
||||
# clean up any empty directories
|
||||
find "${S}" -empty -type d -delete
|
||||
find "${D}" -empty -type d -delete
|
||||
}
|
||||
|
||||
GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
|
||||
|
||||
@@ -12,9 +12,9 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
|
||||
|
||||
PR = "r3"
|
||||
|
||||
BRANCH = "linuxws/scarthgap/k6.6/${PV}"
|
||||
BRANCH = "linuxws/scarthgap/k6.12/${PV}"
|
||||
SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
|
||||
SRCREV = "ba93a3e38c683ccb03a7cf8f2e7dffe2f9cbcf1c"
|
||||
SRCREV = "d578666fc6ecd09f7d6c3431747f1d93d128fe28"
|
||||
S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
|
||||
|
||||
TARGET_PRODUCT:j721e = "j721e_linux"
|
||||
@@ -45,7 +45,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}"
|
||||
def get_file_list(package_list_var, d):
|
||||
file_list = []
|
||||
package_list = d.getVar(package_list_var)
|
||||
prefix = f"{d.getVar('S')}/"
|
||||
prefix = f"{d.getVar('D')}/"
|
||||
if package_list:
|
||||
for package in package_list.split():
|
||||
package_file_string = d.getVar(f"FILES:{package}")
|
||||
@@ -54,7 +54,7 @@ def get_file_list(package_list_var, d):
|
||||
file_list.append(f"{prefix}{package_file}")
|
||||
return " ".join(file_list)
|
||||
|
||||
do_install:prepend() {
|
||||
do_install:append() {
|
||||
if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then
|
||||
for file in ${@get_file_list('GLES_PACKAGES', d)}; do
|
||||
rm -rf ${file}
|
||||
@@ -71,13 +71,13 @@ do_install:prepend() {
|
||||
done
|
||||
fi
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
|
||||
if [ -e ${S}/lib/firmware ]; then
|
||||
mv ${S}/lib/firmware ${S}${nonarch_base_libdir}
|
||||
if [ -e ${D}/lib/firmware ]; then
|
||||
mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
|
||||
fi
|
||||
fi
|
||||
|
||||
# clean up any empty directories
|
||||
find "${S}" -empty -type d -delete
|
||||
find "${D}" -empty -type d -delete
|
||||
}
|
||||
|
||||
GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
|
||||
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
|
||||
|
||||
BRANCH ?= "ti-linux-6.12.y"
|
||||
|
||||
SRCREV ?= "8906665ace32eb0dc12810667ee8646bd660c374"
|
||||
PV = "6.12.9+git"
|
||||
SRCREV ?= "1a22c2fb64485a5dea9a9247eb007ddd4ea8a81d"
|
||||
PV = "6.12.17+git"
|
||||
|
||||
# Special configuration for remoteproc/rpmsg IPC modules
|
||||
module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
# Use different commit, repo and branch for TI extras build
|
||||
# This will have priority over generic rt path
|
||||
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx"
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
|
||||
|
||||
BRANCH = "ti-rt-linux-6.6.y"
|
||||
BRANCH:tie-jailhouse = "ti-rt-linux-6.6.y-jailhouse"
|
||||
BRANCH = "ti-linux-6.12.y"
|
||||
BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
|
||||
|
||||
SRCREV = "fb89cd4d622ce6cc1b7b254ae21298570d437a08"
|
||||
SRCREV:tie-jailhouse = "ea592a872ebdb974f26f6f839596e0a79e9d408b"
|
||||
SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
|
||||
SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
# Use different commit, repo and branch for TI extras build
|
||||
# This will have priority over generic rt path
|
||||
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx"
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
|
||||
|
||||
BRANCH = "ti-linux-6.6.y"
|
||||
BRANCH:tie-jailhouse = "ti-linux-6.6.y-jailhouse"
|
||||
BRANCH = "ti-linux-6.12.y"
|
||||
BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
|
||||
|
||||
SRCREV = "e298dab666632b6f62ed61eac35813331341c3aa"
|
||||
SRCREV:tie-jailhouse = "b45ba5ae4b724d4a09c0c7125ffb49e9d58c04f7"
|
||||
SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
|
||||
SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
|
||||
|
||||
KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git"
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@ EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y"
|
||||
EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
|
||||
|
||||
EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:am62lxx = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:am62pxx = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:j722s = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
PV = "4.4.0+git"
|
||||
SRCREV = "8f645256efc0dc66bd5c118778b0b50c44469ae1"
|
||||
PV = "4.5.0+git"
|
||||
SRCREV = "ef1ebdc23034a804a72da2207f1a825ce96a1464"
|
||||
|
||||
SRC_URI:remove = " \
|
||||
file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
# supports EFI. Boot files are located in the first vfat partition with extra
|
||||
# reserved space. We cannot use a GPT here.
|
||||
|
||||
bootloader --timeout=3 --append="rootfstype=ext4"
|
||||
bootloader --timeout=3 --append="rootfstype=ext4 ${TI_WKS_BOOTLOADER_APPEND}"
|
||||
part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
|
||||
part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
|
||||
|
||||
@@ -10,11 +10,13 @@ JH_CELL_FILES ?= "*.cell"
|
||||
JH_CELL_FILES:k3 ?= "k3-*.cell"
|
||||
JH_CELL_FILES:am62xx ?= "k3-am625-*.cell"
|
||||
JH_CELL_FILES:am62pxx ?= "k3-am62p5-*.cell"
|
||||
JH_CELL_FILES:am62lxx ?= "k3-am62l*.cell"
|
||||
|
||||
JH_INMATE_DTB ?= ""
|
||||
JH_INMATE_DTB:am62xx ?= "inmate-k3-am625-sk.dtb"
|
||||
JH_INMATE_DTB:am65xx ?= "inmate-k3-am654-idk.dtb"
|
||||
JH_INMATE_DTB:am62pxx ?= "inmate-k3-am62p5-sk.dtb"
|
||||
JH_INMATE_DTB:am62lxx ?= "inmate-k3-am62l3-evm.dtb"
|
||||
JH_INMATE_DTB:j7 ?= "inmate-k3-j721e-evm.dtb"
|
||||
JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb"
|
||||
|
||||
@@ -22,6 +24,7 @@ JH_LINUX_DEMO_CELL ?= ""
|
||||
JH_LINUX_DEMO_CELL:am62xx ?= "k3-am625-sk-linux-demo.cell"
|
||||
JH_LINUX_DEMO_CELL:am65xx ?= "k3-am654-idk-linux-demo.cell"
|
||||
JH_LINUX_DEMO_CELL:am62pxx ?= "k3-am62p5-sk-linux-demo.cell"
|
||||
JH_LINUX_DEMO_CELL:am62lxx ?= "k3-am62l3-evm-linux-demo.cell"
|
||||
JH_LINUX_DEMO_CELL:j7 ?= "k3-j721e-evm-linux-demo.cell"
|
||||
JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell"
|
||||
|
||||
@@ -31,6 +34,7 @@ JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
|
||||
JH_CMDLINE ?= ""
|
||||
JH_CMDLINE:am62xx ?= "console=ttyS3,115200n8 earlycon=ns16550a,mmio32,0x02810000"
|
||||
JH_CMDLINE:am62pxx ?= "console=ttyS1,115200n8"
|
||||
JH_CMDLINE:am62lxx ?= "console=ttyS3,115200n8"
|
||||
JH_CMDLINE:am65xx ?= "console=ttyS1,115200n8"
|
||||
JH_CMDLINE:j7 ?= "console=ttyS3,115200n8"
|
||||
JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8"
|
||||
|
||||
@@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
|
||||
"
|
||||
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx"
|
||||
COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
|
||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||
PV = "0.12+git"
|
||||
SRCREV = "9b494ddf4bd8845a2c1063352d08a274ef61777b"
|
||||
SRCREV = "dc77c05460bc3df8f2ddc9cc3a9990ca31cb9f9d"
|
||||
BRANCH = "master"
|
||||
SRC_URI = " \
|
||||
git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \
|
||||
@@ -63,6 +63,7 @@ JH_SYSCONFIG_CELL ?= ""
|
||||
JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell"
|
||||
JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell"
|
||||
JH_SYSCONFIG_CELL:am62pxx ?= "k3-am62p5-sk.cell"
|
||||
JH_SYSCONFIG_CELL:am62lxx ?= "k3-am62l3-evm.cell"
|
||||
JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell"
|
||||
JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user