conf: Add falcon support natively

Add support for building falcon natively and remove the ti-falcon build
option.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>

meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf

@@ -4,14 +4,14 @@
 
 require conf/machine/include/k3r5.inc
 
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
-UBOOT_MACHINE:tie-test-builds = ""
+UBOOT_MACHINE = ""
 
-UBOOT_CONFIG = ""
-UBOOT_CONFIG:tie-test-builds = "usbdfu main"
+#XXX UBOOT_CONFIG = "falcon main"
+UBOOT_CONFIG = "main"
+UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
 UBOOT_CONFIG[main] = "am62ax_evm_r5_defconfig"
+UBOOT_CONFIG[falcon] = "am62ax_evm_r5_defconfig"
 UBOOT_CONFIG[usbdfu] = "am62ax_evm_r5_defconfig"
 
+UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
 UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
-
-UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am62axx-evm.conf

@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62AXX EVM
 
 require conf/machine/include/am62axx.inc
+#XXX require conf/machine/include/ti-falcon.inc
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62a7 \

meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf

@@ -11,15 +11,18 @@ UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = ""
 UBOOT_ECDSA_SIGN_CONFIG:bsp-next = ""
 UBOOT_ECDSA_SIGN_CONFIG:bsp-mainline = ""
 
+#UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} falcon main"
 UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} main"
 UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
 
 UBOOT_CONFIG[main] = "am62px_evm_r5_defconfig"
+UBOOT_CONFIG[falcon] = "am62ax_evm_r5_defconfig"
 UBOOT_CONFIG[ecdsa] = "am62px_evm_r5_defconfig"
 UBOOT_CONFIG[usbdfu] = "am62px_evm_r5_defconfig"
 
 UBOOT_CONFIG_MAKE_OPTS[ecdsa] = "${TI_SIGN_WITH_ECDSA_KEY}"
 
+UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
 UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
 
 UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am62pxx-evm.conf

@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62PX EVM
 
 require conf/machine/include/am62pxx.inc
+#XXX require conf/machine/include/ti-falcon.inc
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62p5 \

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf

@@ -4,14 +4,13 @@
 
 require conf/machine/include/k3r5.inc
 
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-UBOOT_MACHINE:tie-test-builds = ""
+UBOOT_MACHINE = ""
 
-UBOOT_CONFIG = ""
-UBOOT_CONFIG:tie-test-builds = "usbdfu main"
+UBOOT_CONFIG = "falcon main"
+UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
 UBOOT_CONFIG[main] = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG[falcon] = "am62x_evm_r5_defconfig"
 UBOOT_CONFIG[usbdfu] = "am62x_evm_r5_defconfig"
 
+UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
 UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
-
-UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am62xx-evm.conf

@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
 
 require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-falcon.inc
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \

meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf

@@ -4,14 +4,14 @@
 
 require conf/machine/include/k3r5.inc
 
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
-UBOOT_MACHINE:tie-test-builds = ""
+UBOOT_MACHINE = ""
 
-UBOOT_CONFIG = ""
-UBOOT_CONFIG:tie-test-builds = "usbdfu main"
+#XXX UBOOT_CONFIG = "falcon main"
+UBOOT_CONFIG = "main"
+UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
 UBOOT_CONFIG[main] = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG[falcon] = "am62x_lpsk_r5_defconfig"
 UBOOT_CONFIG[usbdfu] = "am62x_lpsk_r5_defconfig"
 
+UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
 UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
-
-UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am62xx-lp-evm.conf

@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
 
 require conf/machine/include/am62xx.inc
+#XXX require conf/machine/include/ti-falcon.inc
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62-lp \

meta-ti-bsp/conf/machine/include/k3.inc

@@ -33,6 +33,11 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image ti-kernel-fitimage"
 
 TFA_PLATFORM = "k3"
 
+# Change the default memory location for all k3 devices.  This requires an
+# in layer config fragment for u-boot.
+TFA_K3_PRELOADED_BL33 ?= "${@ '0x82000000' if d.getVar('BSP_TI_K3_TFA_MOVE') else ''}"
+TFA_K3_HW_CONFIG_BASE ?= "${@ '0x88000000' if d.getVar('BSP_TI_K3_TFA_MOVE') else ''}"
+
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
@@ -56,8 +61,3 @@ TI_WKS_BOOTLOADER_APPEND ?= ""
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
 
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-
-FALCON_INCLUDE = ""
-FALCON_INCLUDE:ti-falcon = "conf/machine/include/ti-falcon.inc"
-
-require ${FALCON_INCLUDE}

meta-ti-bsp/conf/machine/include/ti-bsp.inc

@@ -46,6 +46,8 @@ BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_18 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_18 = "25%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_18 = "24%"
 
+BSP_TI_K3_TFA_MOVE:bsp-ti-6_18 = "1"
+
 # ==========
 # ti-6_12
 # TI staging kernel 6.12, u-boot 2025.01
@@ -95,6 +97,8 @@ BSP_ROGUE_DRIVER_PROVIDER ?= ""
 BSP_ROGUE_DRIVER_VERSION ?= ""
 BSP_MESA_PVR_VERSION ?= ""
 
+BSP_TI_K3_TFA_MOVE ?= ""
+
 # ==========
 # global preferences
 # ==========

meta-ti-bsp/conf/machine/include/ti-falcon.inc

@@ -1,5 +1,4 @@
-IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
-KERNEL_CLASSES:remove = "kernel-fit-extra-artifacts"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = "ti-kernel-fitimage"
-KERNEL_CLASSES += "kernel-fitimage-legacyhs"
-FIT_KERNEL_COMP_ALG = "none"
+#KERNEL_CLASSES:remove = "kernel-fit-extra-artifacts"
+#MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = "ti-kernel-fitimage"
+#KERNEL_CLASSES += "kernel-fitimage-legacyhs"
+#FIT_KERNEL_COMP_ALG = "none"

meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc

@@ -21,7 +21,7 @@ TI_PKA_FW_VERSION = "2.1.0"
 TI_IPC_EXAMPLES_FW_VERSION = "3.52.00.01"
 PCM6240_FW_VERSION = "1.0.0.0"
 
-TI_LINUX_FW_SRCREV ?= "cf4a45b898294c96af02a62b7321c35651b3fa67"
+TI_LINUX_FW_SRCREV ?= "c5eea0af8225334b1babfa750b329200dcee3d2b"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"

meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc

@@ -28,5 +28,5 @@ TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
 EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
 EXTRA_OEMAKE += "${@ 'BL32_BASE=' + d.getVar('TFA_K3_BL32_BASE') if d.getVar('TFA_K3_BL32_BASE') else ''}"
 EXTRA_OEMAKE += "${@ 'PRELOADED_BL33_BASE=' + d.getVar('TFA_K3_PRELOADED_BL33') if d.getVar('TFA_K3_PRELOADED_BL33') else ''}"
+EXTRA_OEMAKE += "${@ 'K3_HW_CONFIG_BASE=' + d.getVar('TFA_K3_HW_CONFIG_BASE') if d.getVar('TFA_K3_HW_CONFIG_BASE') else ''}"
 EXTRA_OEMAKE += "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
-EXTRA_OEMAKE:append:ti-falcon = " PRELOADED_BL33_BASE=0x82000000 K3_HW_CONFIG_BASE=0x88000000"

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc

@@ -25,6 +25,15 @@ UBOOT_GIT_PROTOCOL ?= "https"
 UBOOT_GIT_BRANCH ?= "branch=${BRANCH}"
 SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH};name=uboot"
 
+# Match the meta-ti trusted-firmware-a specific changes to memory locations
+# for bl33 and k3 hardware.
+TI_K3_TFA_CFG_FILES = "\
+    file://k3_tfa.cfg \
+    file://0001-env-Make-the-env-based-on-KConfig-instead-of-hardcod.patch \
+"
+
+SRC_URI:append:k3 = " ${@ '${TI_K3_TFA_CFG_FILES}' if d.getVar('BSP_TI_K3_TFA_MOVE') else ''}"
+
 SRCREV_FORMAT = "uboot"
 
 PV:append = "+git"
@@ -403,18 +412,12 @@ do_deploy:append:am62pxx() {
 	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
 }
 
-do_install:append:ti-falcon() {
+do_install:append() {
+    if [ -f ${B}/tifalcon.bin ]; then
 	install -m 0644 ${B}/tifalcon.bin ${D}/boot
+    fi
 }
 
-FALCON_PKG = ""
-FALCON_PKG:ti-falcon = "${PN}-falcon "
-
-PACKAGES:prepend:am62xx-evm = "${FALCON_PKG} "
-PACKAGES:prepend:am62axx-evm = "${FALCON_PKG} "
-PACKAGES:prepend:am62pxx-evm = "${FALCON_PKG} "
-PACKAGES:prepend:am62xx-lp-evm = "${FALCON_PKG} "
-
 TOOLCHAIN = "gcc"
 
 TI_SIGN_WITH_ECDSA_KEY ?= "SIGNING_KEY=${THISDIR}/files/custMpk_ecdsa.key"

meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-env-Make-the-env-based-on-KConfig-instead-of-hardcod.patch

@@ -0,0 +1,32 @@
+From 25569d2b31a4dcb73bb55cffe13c95afd9441987 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Wed, 4 Feb 2026 14:07:39 -0600
+Subject: [PATCH] env: Make the env based on KConfig instead of hardcoded
+
+testing...
+
+Upstream-Status: Pending
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ include/env/ti/k3_dfu.env | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/env/ti/k3_dfu.env b/include/env/ti/k3_dfu.env
+index 2ea8554d413..3a3eb959b94 100644
+--- a/include/env/ti/k3_dfu.env
++++ b/include/env/ti/k3_dfu.env
+@@ -25,8 +25,8 @@ dfu_alt_info_ospi=
+ 	rootfs raw 0x800000 0x3800000
+ 
+ dfu_alt_info_ram=
+-	tispl.bin ram 0x80080000 0x200000;
+-	u-boot.img ram 0x81000000 0x400000
++	tispl.bin ram CONFIG_SPL_TEXT_BASE 0x200000;
++	u-boot.img ram CONFIG_TEXT_BASE 0x400000
+ 
+ dfu_alt_info_ospi_nand=
+ 	ospi.tiboot3 part 1;
+-- 
+2.43.0
+

meta-ti-bsp/recipes-bsp/u-boot/u-boot/k3_tfa.cfg

@@ -0,0 +1,7 @@
+CONFIG_TEXT_BASE=0x82f80000
+CONFIG_BLOBLIST_ADDR=0x82c80000
+CONFIG_SPL_TEXT_BASE=0x82000000
+CONFIG_SPL_STACK_R_ADDR=0x83f80000
+CONFIG_SPL_BSS_START_ADDR=0x82c00000
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x82f80000
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x82b00000

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.18.bb

@@ -22,7 +22,7 @@ S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 BRANCH ?= "ti-linux-6.18.y"
 
-SRCREV ?= "42b4b84e2cfbbb2b4ccf770d4f7f4b469cdca5df"
+SRCREV ?= "e9ebc825175636714e0ffa113133ef03879748df"
 PV = "6.18.13+git"
 
 KERNEL_REPRODUCIBILITY_PATCHES = " \