diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
index 8268a956..93a41d8d 100644
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -6,16 +6,13 @@ MACHINE_FEATURES += "screen touchscreen"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
 # Default tiboot3.bin on AM62A is for HS-FS
-TI_BOOTLOADERS += "tiboot3-am62ax-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am62ax-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
-TI_BOOTLOADERS += "tiboot3-am62ax-gp-evm.bin"
-TI_MULTICONFIGS += "am62ax-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
 
 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
-TI_BOOTLOADERS += "tiboot3-am62ax-hs-evm.bin"
-TI_MULTICONFIGS += "am62ax-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
 
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc
index cc9a2c01..a2825905 100644
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -7,8 +7,7 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM62Px is for HS-FS
-TI_BOOTLOADERS += "tiboot3-am62px-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am62px-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
 
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 21b6d1ec..070a691b 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -7,16 +7,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM62x is for HS-FS
-TI_BOOTLOADERS += "tiboot3-am62x-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am62x-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
-TI_BOOTLOADERS += "tiboot3-am62x-gp-evm.bin"
-TI_MULTICONFIGS += "am62x-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
 
 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
-TI_BOOTLOADERS += "tiboot3-am62x-hs-evm.bin"
-TI_MULTICONFIGS += "am62x-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
 
 # Bitmap image tarball for early splashscreen
 IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index 95529a83..56b6df78 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -16,16 +16,13 @@ KERNEL_DEVICETREE = " \
 "
 
 # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
-TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am64x_sr2-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
-TI_BOOTLOADERS += "tiboot3-am64x-gp-evm.bin"
-TI_MULTICONFIGS += "am64x-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
 
 # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
-TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-evm.bin"
-TI_MULTICONFIGS += "am64x_sr2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 
 TFA_BOARD = "lite"
 
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 485dcc54..46513141 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -24,14 +24,12 @@ KERNEL_DEVICETREE = " \
 IMAGE_BOOT_FILES += "sysfw.itb"
 
 # Default on AM65x is for GP
-TI_BOOTLOADERS += "tiboot3-am65x_sr2-gp-evm.bin"
-TI_BOOTLOADERS += "sysfw-am65x_sr2-gp-evm.itb"
-TI_MULTICONFIGS += "am65x_sr2-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
 
 # Since default on AM65x is for GP, add a version for HS-SE
-TI_BOOTLOADERS += "tiboot3-am65x_sr2-hs-evm.bin"
-TI_BOOTLOADERS += "sysfw-am65x_sr2-hs-evm.itb"
-TI_MULTICONFIGS += "am65x_sr2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
 
 TFA_BOARD = "generic"
 
diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc
index a7ccea79..327366be 100644
--- a/meta-ti-bsp/conf/machine/include/am68.inc
+++ b/meta-ti-bsp/conf/machine/include/am68.inc
@@ -7,12 +7,10 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM68 is for SR1.0 HS-FS
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
 
 TFA_BOARD = "generic"
 
diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc
index d18cf740..488f9c33 100644
--- a/meta-ti-bsp/conf/machine/include/am69.inc
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -7,12 +7,10 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on AM69 is for SR1.0 HS-FS
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
 
 TFA_BOARD = "j784s4"
 
diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc
index bee2345f..2a11e3dd 100644
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -7,26 +7,18 @@ IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
 # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS
 IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
 IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
-MULTICONFIG_SR1_HS_FS = "j7200-hs-fs-evm"
-MULTICONFIG_SR1_HS_FS:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_HS_FS_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_FS}"
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
 
 # Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
 IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
 IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-MULTICONFIG_SR1_HS_SE = "j7200-hs-evm"
-MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
 
 # Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
-TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j7200_sr2-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE
-TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-evm.bin"
-TI_MULTICONFIGS += "j7200_sr2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
 
 TFA_BOARD = "generic"
 
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 29e50023..62487aa9 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -6,38 +6,29 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
-TI_BOOTLOADERS += "sysfw.itb"
+IMAGE_BOOT_FILES += "sysfw.itb"
 
 # Default on J721e is for GP
-TI_BOOTLOADERS += "tiboot3-j721e-gp-evm.bin"
-TI_BOOTLOADERS += "sysfw-j721e-gp-evm.itb"
-TI_MULTICONFIGS += "j721e-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
 
 # Since default on J721e is for GP, add a version for SR1.1 HS-FS
 IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
 IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
-MULTICONFIG_SR1_1_HS_FS = "j721e_sr1_1-hs-fs-evm"
-MULTICONFIG_SR1_1_HS_FS:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_FS_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_1_HS_FS}"
+IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
 
 # Since default on J721e is for GP, add a version for SR1.1 HS-SE
 IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
-TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_SE_FILES}"
-TI_MULTICONFIGS += "j721e_sr1_1-hs-evm"
+IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
 
 # Since default on J721e is for GP, add a version for SR2.0 HS-FS
 IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
-TI_BOOTLOADERS += "${IMAGE_SR2_HS_FS_FILES}"
-TI_MULTICONFIGS += "j721e_sr2-hs-fs-evm"
+IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
 
 # Since default on J721e is for GP, add a version for SR2.0 HS-SE
 IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
 IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
-MULTICONFIG_SR2_HS_SE = "j721e_sr2-hs-evm"
-MULTICONFIG_SR2_HS_SE:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR2_HS_SE_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR2_HS_SE}"
+IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
 
 TFA_BOARD = "generic"
 
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 5ebb4a16..9cd88d9b 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -7,16 +7,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J721S2 is for GP
-TI_BOOTLOADERS += "tiboot3-j721s2-gp-evm.bin"
-TI_MULTICONFIGS += "j721s2-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
 
 # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
 
 TFA_BOARD = "generic"
 
diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc
index 42f50feb..ef35d83a 100644
--- a/meta-ti-bsp/conf/machine/include/j722s.inc
+++ b/meta-ti-bsp/conf/machine/include/j722s.inc
@@ -7,18 +7,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J722S is for HS-FS
-TI_BOOTLOADERS += "tiboot3-j722s-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j722s-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
 IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
 IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
 IMAGE_SR1_HS_SE_FILES:bsp-next = ""
-MULTICONFIG_SR1_HS_SE = "j722s-hs-evm"
-MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
-MULTICONFIG_SR1_HS_SE:bsp-next = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
 
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc
index 7c248310..aad7a768 100644
--- a/meta-ti-bsp/conf/machine/include/j742s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j742s2.inc
@@ -7,12 +7,10 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J742S2 is for HS-FS
-TI_BOOTLOADERS += "tiboot3-j742s2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j742s2-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE
-TI_BOOTLOADERS += "tiboot3-j742s2-hs-evm.bin"
-TI_MULTICONFIGS += "j742s2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin"
 
 TFA_BOARD = "j784s4"
 
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index 6fb26bbc..883c4a6e 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -7,16 +7,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
 # Default tiboot3.bin on J784S4 is for GP
-TI_BOOTLOADERS += "tiboot3-j784s4-gp-evm.bin"
-TI_MULTICONFIGS += "j784s4-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
 
 # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
 
 # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
 
 TFA_BOARD = "j784s4"
 
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 2e5ffe09..34991ec9 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -48,10 +48,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 
-TI_BOOTLOADERS ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-TI_MULTICONFIGS = ""
-
-IMAGE_BOOT_FILES ?= "${TI_BOOTLOADERS}"
+IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 
 EFI_PROVIDER ?= "grub-efi"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 6092040a..be086936 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -48,6 +48,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc3
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-TI_MULTICONFIGS = ""
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 2287f24c..7e9eb48c 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -94,6 +94,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-TI_MULTICONFIGS = ""
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 74c1defa..2621d19a 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -66,6 +66,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-TI_MULTICONFIGS = ""
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"