From 85d9fc2a25bbd0c2ddf5e262e4fba4ed3543d592 Mon Sep 17 00:00:00 2001 From: Jonas Wood Date: Tue, 11 Nov 2025 19:51:36 -0600 Subject: [PATCH] ti: configs: family: k3: Update to bootable Processor SDK release tag Signed-off-by: Jonas Wood --- config/sources/families/include/k3_common.inc | 7 ++----- config/sources/families/k3-beagle.conf | 1 + config/sources/families/k3.conf | 17 +++++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/config/sources/families/include/k3_common.inc b/config/sources/families/include/k3_common.inc index e804fb2223..c68597d01c 100644 --- a/config/sources/families/include/k3_common.inc +++ b/config/sources/families/include/k3_common.inc @@ -9,9 +9,6 @@ declare -g ARCH="arm64" declare -g OVERLAY_DIR="/boot/dtb/ti/overlay" - -declare -g ATFSOURCE="https://github.com/TexasInstruments/arm-trusted-firmware" - declare -g BOOTSCRIPT="boot-k3.cmd:uEnv.txt" declare -g SPD_OPTEED="SPD=opteed" @@ -64,8 +61,8 @@ function compile_k3_bootgen() { pushd ${SRC}/cache/sources/u-boot-worktree/${BOOTDIR}/${BOOTBRANCH##*:} || exit - run_host_command_logged make -j$(nproc) CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm O=build-r5 ${TIBOOT3_BOOTCONFIG} - run_host_command_logged make -j$(nproc) CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm O=build-r5 BINMAN_INDIRS=${SRC}/cache/sources/ti-linux-firmware + run_host_command_logged make -j$(nproc) CROSS_COMPILE=arm-linux-gnueabi- ARCH=arm O=build-r5 ${TIBOOT3_BOOTCONFIG} + run_host_command_logged make -j$(nproc) CROSS_COMPILE=arm-linux-gnueabi- ARCH=arm O=build-r5 BINMAN_INDIRS=${SRC}/cache/sources/ti-linux-firmware popd } diff --git a/config/sources/families/k3-beagle.conf b/config/sources/families/k3-beagle.conf index cf44dfc46d..999ce3336d 100644 --- a/config/sources/families/k3-beagle.conf +++ b/config/sources/families/k3-beagle.conf @@ -10,6 +10,7 @@ source "${BASH_SOURCE%/*}/include/k3_common.inc" declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family +declare -g ATFSOURCE="https://github.com/TexasInstruments/arm-trusted-firmware" case "${BRANCH}" in diff --git a/config/sources/families/k3.conf b/config/sources/families/k3.conf index 15153af588..ffe526a83b 100644 --- a/config/sources/families/k3.conf +++ b/config/sources/families/k3.conf @@ -10,21 +10,22 @@ source "${BASH_SOURCE%/*}/include/k3_common.inc" declare -g LINUXFAMILY="k3" +declare -g ATFSOURCE="https://github.com/ARM-software/arm-trusted-firmware" case "${BRANCH}" in - vendor | vendor-rt) + vendor | vendor-rt) # uses latest publicly released TI Processor SDK tag - declare -g CORESDK_TAG="tag:11.00.09" + declare -g TI_PSDK_TAG="11.01.16" declare -g KERNELSOURCE="https://github.com/TexasInstruments/ti-linux-kernel" declare -g KERNEL_MAJOR_MINOR="6.12" - declare -g KERNELBRANCH="${CORESDK_TAG}" - declare -g KERNEL_DESCRIPTION="Texas Instruments currently supported SDK (vendor) kernel" - declare -g ATFBRANCH="${CORESDK_TAG}" - declare -g OPTEE_BRANCH="tag:4.6.0" - declare -g TI_LINUX_FIRMWARE_BRANCH="${CORESDK_TAG}" + declare -g KERNELBRANCH="tag:${TI_PSDK_TAG}" + declare -g KERNEL_DESCRIPTION="Texas Instruments currently supported Processor SDK kernel" + declare -g ATFBRANCH="commit:e0c4d3903b382bf34f552af53e6d955fae5283ab" + declare -g OPTEE_BRANCH="commit:a9690ae39995af36a31b7a4f446f27ea0787e3a4" + declare -g TI_LINUX_FIRMWARE_BRANCH="tag:${TI_PSDK_TAG}" declare -g BOOTSOURCE="https://github.com/TexasInstruments/ti-u-boot" - declare -g BOOTBRANCH="${CORESDK_TAG}" + declare -g BOOTBRANCH="tag:${TI_PSDK_TAG}" EXTRAWIFI="no" ;;