diff --git a/meta-bsp/conf/layer.conf b/meta-bsp/conf/layer.conf
index 434ea61c33..c3c30a2393 100644
--- a/meta-bsp/conf/layer.conf
+++ b/meta-bsp/conf/layer.conf
@@ -58,16 +58,16 @@ IMX_DEFAULT_BSP = "nxp"
 # override it here.
 IMX_DEFAULT_BOOTLOADER:imx-nxp-bsp = "u-boot-imx"
 
-UBOOT_MAKE_TARGET:pn-u-boot-imx:mx6-nxp-bsp = "u-boot.imx"
-UBOOT_MAKE_TARGET:pn-u-boot-imx:mx7-nxp-bsp = "u-boot.imx"
-UBOOT_SUFFIX:pn-u-boot-imx:mx6-nxp-bsp = "imx"
-UBOOT_SUFFIX:pn-u-boot-imx:mx7-nxp-bsp = "imx"
-UBOOT_SUFFIX:pn-u-boot-imx:mx8-nxp-bsp = "bin"
-UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool:mx6-nxp-bsp = "u-boot.imx"
-UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool:mx7-nxp-bsp = "u-boot.imx"
-UBOOT_SUFFIX:pn-u-boot-imx-mfgtool:mx6-nxp-bsp = "imx"
-UBOOT_SUFFIX:pn-u-boot-imx-mfgtool:mx7-nxp-bsp = "imx"
-UBOOT_SUFFIX:pn-u-boot-imx-mfgtool:mx8-nxp-bsp = "bin"
+UBOOT_MAKE_TARGET:pn-u-boot-imx:mx6-nxp-bsp ?= "u-boot.imx"
+UBOOT_MAKE_TARGET:pn-u-boot-imx:mx7-nxp-bsp ?= "u-boot.imx"
+UBOOT_SUFFIX:pn-u-boot-imx:mx6-nxp-bsp ?= "imx"
+UBOOT_SUFFIX:pn-u-boot-imx:mx7-nxp-bsp ?= "imx"
+UBOOT_SUFFIX:pn-u-boot-imx:mx8-nxp-bsp ?= "bin"
+UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool:mx6-nxp-bsp ?= "u-boot.imx"
+UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool:mx7-nxp-bsp ?= "u-boot.imx"
+UBOOT_SUFFIX:pn-u-boot-imx-mfgtool:mx6-nxp-bsp ?= "imx"
+UBOOT_SUFFIX:pn-u-boot-imx-mfgtool:mx7-nxp-bsp ?= "imx"
+UBOOT_SUFFIX:pn-u-boot-imx-mfgtool:mx8-nxp-bsp ?= "bin"
 
 IMX_DEFAULT_UBOOTTOOLS = "u-boot-imx-tools"
 PREFERRED_PROVIDER_u-boot-tools-native = "${IMX_DEFAULT_UBOOTTOOLS}-native"