ti: configs: Update config naming for kernel 6.18

jonaswood01 · jonaswood01 · commit ab4aacb7569d · 2026-04-10T11:09:46.000-05:00
Signed-off-by: Jonas Wood &lt;jw@ti.com&gt;
diff --git a/config/boards/beaglebone-ai64.conf b/config/boards/beaglebone-ai64.conf
@@ -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"
diff --git a/config/boards/beagleplay.conf b/config/boards/beagleplay.conf
@@ -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"
diff --git a/config/boards/beagley-ai.conf b/config/boards/beagley-ai.conf
@@ -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"
diff --git a/config/boards/pocketbeagle2.conf b/config/boards/pocketbeagle2.conf
@@ -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"
diff --git a/config/boards/sk-am62-lp.conf b/config/boards/sk-am62-lp.conf
@@ -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"
diff --git a/config/boards/sk-am62-sip.conf b/config/boards/sk-am62-sip.conf
@@ -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
diff --git a/config/boards/sk-am62b.conf b/config/boards/sk-am62b.conf
@@ -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"
diff --git a/config/boards/sk-am62p.conf b/config/boards/sk-am62p.conf
@@ -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"
diff --git a/config/boards/sk-am64b.conf b/config/boards/sk-am64b.conf
@@ -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"
diff --git a/config/boards/sk-am68.conf b/config/boards/sk-am68.conf
@@ -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"
diff --git a/config/boards/sk-am69.conf b/config/boards/sk-am69.conf
@@ -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"
diff --git a/config/boards/sk-tda4vm.conf b/config/boards/sk-tda4vm.conf
@@ -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"
diff --git a/config/boards/tmds62levm.conf b/config/boards/tmds62levm.conf
@@ -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"
diff --git a/config/sources/families/include/k3_common.inc b/config/sources/families/include/k3_common.inc
@@ -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"
 
@@ -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"
