From f2b431d2861a5272ca2e91dcb08e667d54fa27e2 Mon Sep 17 00:00:00 2001 From: Jonas Wood Date: Tue, 11 Nov 2025 19:21:13 -0600 Subject: [PATCH] ti: configs: family: k3: Change current/edge to vendor/vendor-edge Signed-off-by: Jonas Wood --- config/boards/sk-am62b.conf | 4 ++-- config/boards/sk-am62p.conf | 4 ++-- config/boards/sk-am64b.conf | 4 ++-- config/boards/sk-am68.conf | 4 ++-- config/boards/sk-am69.conf | 4 ++-- config/boards/sk-tda4vm.conf | 4 ++-- ...gle-current-rt.config => linux-k3-beagle-vendor-rt.config} | 0 ...k3-beagle-current.config => linux-k3-beagle-vendor.config} | 0 .../{linux-k3-edge.config => linux-k3-vendor-edge.config} | 0 .../{linux-k3-current-rt.config => linux-k3-vendor-rt.config} | 0 .../{linux-k3-current.config => linux-k3-vendor.config} | 0 config/sources/families/k3-beagle.conf | 3 ++- config/sources/families/k3.conf | 4 ++-- 13 files changed, 16 insertions(+), 15 deletions(-) rename config/kernel/{linux-k3-beagle-current-rt.config => linux-k3-beagle-vendor-rt.config} (100%) rename config/kernel/{linux-k3-beagle-current.config => linux-k3-beagle-vendor.config} (100%) rename config/kernel/{linux-k3-edge.config => linux-k3-vendor-edge.config} (100%) rename config/kernel/{linux-k3-current-rt.config => linux-k3-vendor-rt.config} (100%) rename config/kernel/{linux-k3-current.config => linux-k3-vendor.config} (100%) diff --git a/config/boards/sk-am62b.conf b/config/boards/sk-am62b.conf index 16cd481089..6417320c97 100644 --- a/config/boards/sk-am62b.conf +++ b/config/boards/sk-am62b.conf @@ -9,8 +9,8 @@ BOOT_FDT_FILE="ti/k3-am625-sk.dts" TIBOOT3_BOOTCONFIG="am62x_evm_r5_defconfig" TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin" DEFAULT_CONSOLE="serial" -KERNEL_TARGET="current,edge" -KERNEL_TEST_TARGET="current" +KERNEL_TARGET="vendor,vendor-rt,vendor-edge" +KERNEL_TEST_TARGET="vendor" SERIALCON="ttyS2" ATF_BOARD="lite" OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1" diff --git a/config/boards/sk-am62p.conf b/config/boards/sk-am62p.conf index df515e9d7a..ac280c358d 100644 --- a/config/boards/sk-am62p.conf +++ b/config/boards/sk-am62p.conf @@ -9,8 +9,8 @@ BOOT_FDT_FILE="ti/k3-am62p5-sk.dts" TIBOOT3_BOOTCONFIG="am62px_evm_r5_defconfig" TIBOOT3_FILE="tiboot3-am62px-hs-fs-evm.bin" DEFAULT_CONSOLE="serial" -KERNEL_TARGET="current,edge" -KERNEL_TEST_TARGET="current" +KERNEL_TARGET="vendor,vendor-rt,vendor-edge" +KERNEL_TEST_TARGET="vendor" SERIALCON="ttyS2" ATF_BOARD="lite" OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1" diff --git a/config/boards/sk-am64b.conf b/config/boards/sk-am64b.conf index dcf48b7c82..52d5bf419d 100644 --- a/config/boards/sk-am64b.conf +++ b/config/boards/sk-am64b.conf @@ -10,8 +10,8 @@ TIBOOT3_BOOTCONFIG="am64x_evm_r5_defconfig" TIBOOT3_FILE="tiboot3-am64x_sr2-hs-fs-evm.bin" DEFAULT_CONSOLE="serial" HAS_VIDEO_OUTPUT="no" -KERNEL_TARGET="current,edge" -KERNEL_TEST_TARGET="current" +KERNEL_TARGET="vendor,vendor-rt,vendor-edge" +KERNEL_TEST_TARGET="vendor" SERIALCON="ttyS2" ATF_BOARD="lite" OPTEE_ARGS="" diff --git a/config/boards/sk-am68.conf b/config/boards/sk-am68.conf index dada63fac4..a7611f8263 100644 --- a/config/boards/sk-am68.conf +++ b/config/boards/sk-am68.conf @@ -9,8 +9,8 @@ BOOT_FDT_FILE="ti/k3-am68-sk-base-board.dts" TIBOOT3_BOOTCONFIG="j721s2_evm_r5_defconfig" TIBOOT3_FILE="tiboot3-j721s2-hs-fs-evm.bin" DEFAULT_CONSOLE="serial" -KERNEL_TARGET="current,edge" -KERNEL_TEST_TARGET="current" +KERNEL_TARGET="vendor,vendor-rt,vendor-edge" +KERNEL_TEST_TARGET="vendor" SERIALCON="ttyS2" ATF_BOARD="generic" ATF_K3_USART_OFFSET="K3_USART=0x8" diff --git a/config/boards/sk-am69.conf b/config/boards/sk-am69.conf index bb3eeda781..ffa716af62 100644 --- a/config/boards/sk-am69.conf +++ b/config/boards/sk-am69.conf @@ -9,8 +9,8 @@ BOOT_FDT_FILE="ti/k3-am69-sk.dts" TIBOOT3_BOOTCONFIG="am69_sk_r5_defconfig" TIBOOT3_FILE="tiboot3-j784s4-hs-fs-evm.bin" DEFAULT_CONSOLE="serial" -KERNEL_TARGET="current,edge" -KERNEL_TEST_TARGET="current" +KERNEL_TARGET="vendor,vendor-rt,vendor-edge" +KERNEL_TEST_TARGET="vendor" SERIALCON="ttyS2" ATF_BOARD="j784s4" ATF_K3_USART_OFFSET="K3_USART=0x8" diff --git a/config/boards/sk-tda4vm.conf b/config/boards/sk-tda4vm.conf index f3b8348813..ed70a0df1d 100644 --- a/config/boards/sk-tda4vm.conf +++ b/config/boards/sk-tda4vm.conf @@ -12,8 +12,8 @@ SYSFW_FILE="sysfw-j721e-gp-evm.itb" TISPL_FILE="tispl.bin_unsigned" UBOOT_FILE="u-boot.img_unsigned" DEFAULT_CONSOLE="serial" -KERNEL_TARGET="current,edge" -KERNEL_TEST_TARGET="current" +KERNEL_TARGET="vendor,vendor-rt,vendor-edge" +KERNEL_TEST_TARGET="vendor" SERIALCON="ttyS2" ATF_BOARD="generic" OPTEE_ARGS="" diff --git a/config/kernel/linux-k3-beagle-current-rt.config b/config/kernel/linux-k3-beagle-vendor-rt.config similarity index 100% rename from config/kernel/linux-k3-beagle-current-rt.config rename to config/kernel/linux-k3-beagle-vendor-rt.config diff --git a/config/kernel/linux-k3-beagle-current.config b/config/kernel/linux-k3-beagle-vendor.config similarity index 100% rename from config/kernel/linux-k3-beagle-current.config rename to config/kernel/linux-k3-beagle-vendor.config diff --git a/config/kernel/linux-k3-edge.config b/config/kernel/linux-k3-vendor-edge.config similarity index 100% rename from config/kernel/linux-k3-edge.config rename to config/kernel/linux-k3-vendor-edge.config diff --git a/config/kernel/linux-k3-current-rt.config b/config/kernel/linux-k3-vendor-rt.config similarity index 100% rename from config/kernel/linux-k3-current-rt.config rename to config/kernel/linux-k3-vendor-rt.config diff --git a/config/kernel/linux-k3-current.config b/config/kernel/linux-k3-vendor.config similarity index 100% rename from config/kernel/linux-k3-current.config rename to config/kernel/linux-k3-vendor.config diff --git a/config/sources/families/k3-beagle.conf b/config/sources/families/k3-beagle.conf index 4713ecfcb5..71bb742ce6 100644 --- a/config/sources/families/k3-beagle.conf +++ b/config/sources/families/k3-beagle.conf @@ -15,7 +15,8 @@ declare -g BOOTSOURCE="https://github.com/beagleboard/u-boot" # BeagleBoard u-bo case "${BRANCH}" in - current | current-rt) + vendor | vendor-rt) + declare -g KERNEL_MAJOR_MINOR="6.12" declare -g KERNELBRANCH="branch:v6.12.49-ti-arm64-r56" declare -g BOOTBRANCH="branch:v2025.07-am6232-pocketbeagle2" diff --git a/config/sources/families/k3.conf b/config/sources/families/k3.conf index 4d7bbd04d9..2b3794ae6b 100644 --- a/config/sources/families/k3.conf +++ b/config/sources/families/k3.conf @@ -15,7 +15,7 @@ declare -g BOOTSOURCE="https://github.com/TexasInstruments/ti-u-boot" case "${BRANCH}" in - current | current-rt) + vendor | vendor-rt) declare -g CORESDK_TAG="tag:11.00.09" declare -g KERNEL_MAJOR_MINOR="6.12" @@ -28,7 +28,7 @@ case "${BRANCH}" in EXTRAWIFI="no" ;; - edge) + vendor-edge) declare -g CORESDK_TAG="tag:11.00.12" declare -g KERNEL_MAJOR_MINOR="6.12"