diff --git a/board/ti/am62x-sk/readme.txt b/board/ti/am62x-sk/readme.txt
index 5af1c59c2d..a8d0c08dc0 100644
--- a/board/ti/am62x-sk/readme.txt
+++ b/board/ti/am62x-sk/readme.txt
@@ -17,6 +17,22 @@ Optional: modify the configuration:
 
 $ make menuconfig
 
+IMPORTANT: make sure to use the tiboot3 firmware that match with the TI
+K3 SoC boot ROM (tiboot3-am62x-{gp/hs-fs/hs}-*.bin) used on the board.
+
+HS-FS should be the default for all TI AM6x devices but earlier version
+of TI starter kit EVMs for AM6x was produced with a GP device.
+
+See further details on e2e Forum [1] :
+
+   "Unfortunately with this transition any existing GP device based AM62x
+   (and AM64x) boards will no longer boot with MMC/SD card images generated"
+
+For such existing GP device based AM62x boards, users have to provide the
+tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN.
+
+[1]: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto
+
 Build:
 
 $ make
diff --git a/board/ti/am64x-sk/readme.txt b/board/ti/am64x-sk/readme.txt
index 5ddbb836ed..73215cb591 100644
--- a/board/ti/am64x-sk/readme.txt
+++ b/board/ti/am64x-sk/readme.txt
@@ -17,6 +17,22 @@ Optional: modify the configuration:
 
 $ make menuconfig
 
+IMPORTANT: make sure to use the tiboot3 firmware that match with the TI
+K3 SoC boot ROM (tiboot3-am64x-{gp/hs-fs/hs}-*.bin) used on the board.
+
+HS-FS should be the default for all TI AM6x devices but earlier version
+of TI starter kit EVMs for AM6x was produced with a GP device.
+
+See further details on e2e Forum [1] :
+
+   "Unfortunately with this transition any existing GP device based AM62x
+   (and AM64x) boards will no longer boot with MMC/SD card images generated"
+
+For such existing GP device based AM64x boards, users have to provide the
+tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN.
+
+[1]: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto
+
 Build:
 
 $ make
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index fa2c008d4c..5c7b97b3b0 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
 BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
 BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
-BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index f7c6d16b35..28e97f94e2 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
 BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
 BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
-BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y