Skip to content

ti: configs: family: k3: Update baseline to 12.00.00.07 #9643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jonaswood01 wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

ti: configs: family: k3: Update baseline to 12.00.00.07 #9643

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cd64db
ti: configs: family: k3: Update baseline to 12.00.00.07
jonaswood01 Apr 8, 2026
ab4aacb
ti: configs: Update config naming for kernel 6.18
jonaswood01 Apr 8, 2026
cb3f725
ti: configs: kernel: k3: Update vendor and edge configs for kernel 6.18
jonaswood01 Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/boards/beaglebone-ai64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="generic"
OPTEE_ARGS=""
OPTEE_PLATFORM="k3-j721e"
1 change: 1 addition & 0 deletions config/boards/beagleplay.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="lite"
OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
OPTEE_PLATFORM="k3-am62x"
1 change: 1 addition & 0 deletions config/boards/beagley-ai.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="lite"
OPTEE_ARGS=""
OPTEE_PLATFORM="k3-am62x"
Expand Down
1 change: 1 addition & 0 deletions config/boards/pocketbeagle2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2,ttyGS0"
ATF_PLAT="k3"
ATF_BOARD="lite"
SRC_EXTLINUX="yes"
SRC_CMDLINE="root=/dev/mmcblk1p2 rootwait console=ttyS2,115200n8 console=ttyGS0,115200n8 modules-load=dwc2,g_cdc"
Expand Down
1 change: 1 addition & 0 deletions config/boards/sk-am62-lp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="lite"
OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
OPTEE_PLATFORM="k3-am62x"
9 changes: 5 additions & 4 deletions config/boards/sk-am62-sip.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ BOARD_VENDOR="ti"
BOARDFAMILY="k3"
BOARD_MAINTAINER="jonaswood01"
BOOT_SOC="am62"
BOOTCONFIG="am6254xxl_evm_a53_defconfig"
BOOTCONFIG="am6254atl_evm_a53_defconfig"
BOOTFS_TYPE="fat"
BOOT_FDT_FILE="ti/k3-am6254xxl-sk.dts"
TIBOOT3_BOOTCONFIG="am6254xxl_evm_r5_defconfig"
BOOT_FDT_FILE="ti/k3-am6254atl-sk.dts"
TIBOOT3_BOOTCONFIG="am6254atl_evm_r5_defconfig"
TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin"
DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="lite"
ATF_ARGS="BL32_BASE=0x80080000 PRELOADED_BL33_BASE=0x82000000" # Manual memory region definitions required for fixed 512MB RAM
OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1 CFG_TZDRAM_START=0x80080000" # See U-Boot docs for more info: https://docs.u-boot.org/en/latest/board/ti/am6254atl_sk.html#a53-spl-ddr-memory-layout
Expand Down
1 change: 1 addition & 0 deletions config/boards/sk-am62b.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="lite"
OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
OPTEE_PLATFORM="k3-am62x"
Expand Down
3 changes: 2 additions & 1 deletion config/boards/sk-am62p.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="lite"
OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
OPTEE_PLATFORM="k3-am62x"
OPTEE_PLATFORM="k3-am62px"
CC33XX_SUPPORT="yes"
1 change: 1 addition & 0 deletions config/boards/sk-am64b.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="lite"
OPTEE_ARGS=""
OPTEE_PLATFORM="k3-am64x"
1 change: 1 addition & 0 deletions config/boards/sk-am68.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="generic"
ATF_ARGS="K3_USART=0x8"
OPTEE_ARGS="CFG_CONSOLE_UART=0x8"
Expand Down
1 change: 1 addition & 0 deletions config/boards/sk-am69.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="j784s4"
ATF_ARGS="K3_USART=0x8"
OPTEE_ARGS="CFG_CONSOLE_UART=0x8"
Expand Down
1 change: 1 addition & 0 deletions config/boards/sk-tda4vm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_PLAT="k3"
ATF_BOARD="generic"
OPTEE_ARGS=""
OPTEE_PLATFORM="k3-j721e"
5 changes: 3 additions & 2 deletions config/boards/tmds62levm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ DEFAULT_CONSOLE="serial"
KERNEL_TARGET="vendor,vendor-rt,vendor-edge"
KERNEL_TEST_TARGET="vendor"
SERIALCON="ttyS2"
ATF_BOARD="am62l"
EXTRA_ATF_TARGETS="build/k3/am62l/release/bl1.bin:bl1.bin"
ATF_PLAT="k3low"
ATF_BOARD="am62lx"
EXTRA_ATF_TARGETS="build/${ATF_PLAT}/${ATF_BOARD}/release/bl1.bin:bl1.bin"
OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
OPTEE_PLATFORM="k3-am62lx"
EXTRA_BOOT_ARGS="BL1=bl1.bin"
Expand Down
7 changes: 3 additions & 4 deletions config/sources/families/include/k3_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
declare -g ARCH="arm64"
declare -g OVERLAY_DIR="/boot/dtb/ti/overlay"
declare -g BOOTSCRIPT="boot-k3.cmd:uEnv.txt"
declare -g SPD_OPTEED="SPD=opteed"
declare -g CLEAN_LEVEL="make-atf,make-uboot"

declare -g INSTALL_HEADERS="yes"

Expand Down Expand Up @@ -41,10 +41,9 @@ case "${BRANCH}" in

esac

ATF_PLAT="k3"
ATF_TARGET_MAP="PLAT=$ATF_PLAT TARGET_BOARD=$ATF_BOARD ${SPD_OPTEED} ${ATF_ARGS} all;;build/$ATF_PLAT/$ATF_BOARD/release/bl31.bin:bl31.bin ${EXTRA_ATF_TARGETS}"
ATF_TARGET_MAP="PLAT=${ATF_PLAT} TARGET_BOARD=${ATF_BOARD} SPD=opteed ${ATF_ARGS} all;;build/${ATF_PLAT}/${ATF_BOARD}/release/bl31.bin:bl31.bin ${EXTRA_ATF_TARGETS}"

UBOOT_TARGET_MAP="BL31=bl31.bin ${EXTRA_BOOT_ARGS} TEE=${SRC}/cache/sources/optee-os/out/arm-plat-k3/core/tee-raw.bin BINMAN_INDIRS=${SRC}/cache/sources/ti-linux-firmware all;;tiboot3.bin ${SYSFW_FILE:+sysfw.itb} tispl.bin u-boot.img"
UBOOT_TARGET_MAP="BL31=bl31.bin ${EXTRA_BOOT_ARGS} TEE=${SRC}/cache/sources/optee-os/out/arm-plat-k3/core/tee-pager_v2.bin BINMAN_INDIRS=${SRC}/cache/sources/ti-linux-firmware all;;tiboot3.bin ${SYSFW_FILE:+sysfw.itb} tispl.bin u-boot.img"

# To match what our current SDK produces
BOOT_FS_LABEL="boot"
Expand Down
18 changes: 9 additions & 9 deletions config/sources/families/k3.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ case "${BRANCH}" in

vendor | vendor-rt) # uses latest publicly released TI Processor SDK tag

declare -g TI_PSDK_TAG="11.02.08"
declare -g TI_PSDK_TAG="12.00.00.07"
declare -g KERNELSOURCE="https://github.com/TexasInstruments/ti-linux-kernel"
declare -g KERNEL_MAJOR_MINOR="6.12"
declare -g KERNEL_MAJOR_MINOR="6.18"
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 ATFBRANCH="commit:76500ceaeefcda967d8a1f4e30bb04f9fe0425a2"
declare -g OPTEE_BRANCH="commit:f2a7ad0638aeff5243593b33cc56ad064cae7615"
declare -g TI_LINUX_FIRMWARE_BRANCH="tag:${TI_PSDK_TAG}"
declare -g BOOTSOURCE="https://github.com/TexasInstruments/ti-u-boot"
declare -g BOOTBRANCH="tag:${TI_PSDK_TAG}"
Expand All @@ -32,14 +32,14 @@ case "${BRANCH}" in
vendor-edge) # uses latest pre-released TI Processor SDK tag

declare -g KERNELSOURCE="https://github.com/TexasInstruments/ti-linux-kernel"
declare -g KERNEL_MAJOR_MINOR="6.12"
declare -g KERNELBRANCH="branch:ti-linux-6.12.y"
declare -g KERNEL_MAJOR_MINOR="6.18"
declare -g KERNELBRANCH="branch:ti-linux-6.18.y"
declare -g KERNEL_DESCRIPTION="Texas Instruments latest pre-released Processor SDK kernel"
declare -g ATFBRANCH="branch:master"
declare -g OPTEE_BRANCH="branch:master"
declare -g TI_LINUX_FIRMWARE_BRANCH="branch:ti-linux-firmware"
declare -g BOOTSOURCE="https://github.com/TexasInstruments/ti-u-boot"
declare -g BOOTBRANCH="branch:ti-u-boot-2025.01"
declare -g BOOTBRANCH="branch:ti-u-boot-2026.01"
EXTRAWIFI="no"
;;

Expand All @@ -51,9 +51,9 @@ case "${BOOT_SOC}" in

declare -g ATFSOURCE="https://github.com/TexasInstruments/arm-trusted-firmware"
if [[ "${BRANCH}" == "vendor" || "${BRANCH}" == "vendor-rt" ]]; then
declare -g ATFBRANCH="commit:5939ceaeb664b8da5499dc4ecfa1caa7f5bcc31a"
declare -g ATFBRANCH="commit:d203b8453905178252094416448de009931087e0"
elif [[ "${BRANCH}" == "vendor-edge" ]]; then
declare -g ATFBRANCH="branch:ti-master"
declare -g ATFBRANCH="branch:ti-tfa-2.14.y"
fi
;;

Expand Down
Loading