ti: configs: Update config naming for kernel 6.18

Signed-off-by: Jonas Wood <jw@ti.com>

Author: jonaswood01

config/boards/sk-am62-sip.conf

@@ -5,13 +5,13 @@ 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_BOARD="lite"

config/boards/sk-am62p.conf

@@ -16,5 +16,5 @@ KERNEL_TEST_TARGET="vendor"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
 OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
-OPTEE_PLATFORM="k3-am62x"
+OPTEE_PLATFORM="k3-am62px"
 CC33XX_SUPPORT="yes"

config/boards/tmds62levm.conf

@@ -13,8 +13,8 @@ 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_BOARD="am62lx"
+EXTRA_ATF_TARGETS="build/k3low/am62lx/release/bl1.bin:bl1.bin"
 OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
 OPTEE_PLATFORM="k3-am62lx"
 EXTRA_BOOT_ARGS="BL1=bl1.bin"

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"
 
@@ -42,9 +42,12 @@ 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}"
+if [[ "${BOOT_SOC}" == "am62l" ]]; then
+	ATF_PLAT="k3low"
+fi
+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"