diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
index fb2fa7cf..d4384650 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/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"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index 01955470..3019656a 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/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 \
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
index 292b658b..524493b1 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/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"
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
index bc056e6b..f72ba2e0 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/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 \
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
index 9c8147e8..9f250990 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/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"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index dd91ae66..c2012ccb 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/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 \
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
index c65c624c..dab1c48f 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/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"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index d1f6660c..ea590cb6 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/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 \
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index addc42c3..c08b5612 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -61,8 +61,3 @@ TI_WKS_BOOTLOADER_APPEND ?= "console=${KERNEL_CONSOLE}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
 
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS0"
-
-FALCON_INCLUDE = ""
-FALCON_INCLUDE:ti-falcon = "conf/machine/include/ti-falcon.inc"
-
-require ${FALCON_INCLUDE}
diff --git a/meta-ti-bsp/conf/machine/include/ti-falcon.inc b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
index 5f5e2148..39319a9f 100644
--- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc
+++ b/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"
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
index 403f4d88..d3ddabbe 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -30,4 +30,3 @@ EXTRA_OEMAKE += "${@ 'BL32_BASE=' + d.getVar('TFA_K3_BL32_BASE') if d.getVar('TF
 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"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index 317cfd93..1c3efebb 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -412,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"