From e5c6a97d1d3b4e8723a2ddf81a9d5adc77700391 Mon Sep 17 00:00:00 2001 From: Suhaas Joshi Date: Wed, 7 May 2025 11:33:41 +0530 Subject: [PATCH] ti: config: family: k3: Update baselines for `current` and `edge` Currently `current` picks 6.6.y kernel baseline, and `edge` picks upstream's 6.12.y tree. Make `current` pick the current SDK release (which, at the moment, is at 11.00.09 baseline), and make `edge` pick the latest un-released RC's from TI's tree. `current` is what most people will use, therefore it should be the same as our official and tested release. `edge` can be either cutting-edge (latest RC) or bleeding-edge (latest commit on cicd branch). For now, keep it cutting-edge. Signed-off-by: Suhaas Joshi --- config/sources/families/k3.conf | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/config/sources/families/k3.conf b/config/sources/families/k3.conf index cbe2dd24ea..0c4748355c 100644 --- a/config/sources/families/k3.conf +++ b/config/sources/families/k3.conf @@ -10,9 +10,11 @@ declare -g ARCH="arm64" declare -g LINUXFAMILY="k3" declare -g OVERLAY_DIR="/boot/dtb/ti/overlay" -declare -g ATFBRANCH="tag:v2.12.0" -declare -g BOOTBRANCH="tag:v2025.01" +declare -g KERNELSOURCE="https://github.com/TexasInstruments-Sandbox/ti-linux-kernel" +declare -g ATFSOURCE="https://github.com/TexasInstruments/arm-trusted-firmware" +declare -g BOOTSOURCE="https://git.ti.com/cgit/ti-u-boot/ti-u-boot" + declare -g BOOTSCRIPT="boot-k3.cmd:uEnv.txt" declare -g INSTALL_HEADERS="yes" @@ -21,15 +23,22 @@ case "${BRANCH}" in current) - declare -g KERNELSOURCE="https://github.com/TexasInstruments-Sandbox/ti-linux-kernel" - declare -g KERNEL_MAJOR_MINOR="6.6" - declare -g KERNELBRANCH="branch:ti-linux-6.6.y" + declare -g CORESDK_TAG="tag:11.00.09" + declare -g KERNEL_MAJOR_MINOR="6.12" + declare -g KERNELBRANCH="${CORESDK_TAG}" + declare -g ATFBRANCH="commit:b11beb2b6bd30b75c4bfb0e9925c0e72f16ca53f" + declare -g TI_LINUX_FIRMWARE_BRANCH="${CORESDK_TAG}" + declare -g BOOTBRANCH="${CORESDK_TAG}" ;; edge) + declare -g CORESDK_TAG="tag:11.00.12" declare -g KERNEL_MAJOR_MINOR="6.12" - declare -g KERNELBRANCH='branch:linux-6.12.y' + declare -g KERNELBRANCH="${CORESDK_TAG}" + declare -g ATFBRANCH="commit:b45324936bbba464b0623c83cd5aa53e1cd4cbdb" + declare -g TI_LINUX_FIRMWARE_BRANCH="${CORESDK_TAG}" + declare -g BOOTBRANCH="${CORESDK_TAG}" EXTRAWIFI="no" ;; @@ -51,7 +60,7 @@ function add_host_dependencies__k3_python3_dep() { function compile_k3_bootgen() { # Source code checkout - (fetch_from_repo "https://github.com/TexasInstruments-Sandbox/ti-linux-firmware" "ti-linux-firmware" "branch:ti-linux-firmware") + (fetch_from_repo "https://github.com/TexasInstruments-Sandbox/ti-linux-firmware" "ti-linux-firmware" ${TI_LINUX_FIRMWARE_BRANCH}) pushd ${SRC}/cache/sources/u-boot-worktree/${BOOTDIR}/${BOOTBRANCH##*:} || exit