2 files changed, 5 insertions, 2 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 5634d3912..cb3326eed 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -106,6 +106,7 @@ UBOOT_PROVIDES_BOOT_CONTAINER = "0"
 # The boot container should be used only if we're not using u-boot-imx as
 # IMX_DEFAULT_BOOTLOADER.
 UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}"
+UBOOT_PROVIDES_BOOT_CONTAINER:mx93-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}"
 
 # i.MX95 mainline U-Boot uses binman to assemble the boot container.
 UBOOT_PROVIDES_BOOT_CONTAINER:mx95-mainline-bsp = "1"
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index 9e9108d99..18f7fc293 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -1,5 +1,9 @@
 MACHINEOVERRIDES =. "mx93:"
 
+# To avoid unexpected changes for existing users, maintain the historical
+# default of the vendor BSP, despite mainline support being available.
+IMX_DEFAULT_BSP ?= "nxp"
+
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
 
@@ -49,5 +53,3 @@ IMX_BOOT_SEEK = "32"
 
 # We have to disable SERIAL_CONSOLE due to auto-serial-console
 SERIAL_CONSOLES = "115200;ttyLP0"
-
-IMX_DEFAULT_BSP = "nxp"