diff --git a/meta-bsp/conf/layer.conf b/meta-bsp/conf/layer.conf
index eaafae2e0a..390cc0afbb 100644
--- a/meta-bsp/conf/layer.conf
+++ b/meta-bsp/conf/layer.conf
@@ -45,8 +45,10 @@ IMX_DEFAULT_BSP = "nxp"
 # override it here.
 IMX_DEFAULT_BOOTLOADER_imx = "u-boot-imx"
 
-UBOOT_MAKE_TARGET_pn-u-boot-imx ?= "u-boot.${UBOOT_SUFFIX}"
-UBOOT_SUFFIX_pn-u-boot-imx ?= "imx"
+UBOOT_MAKE_TARGET_pn-u-boot-imx_mx6 = "u-boot.imx"
+UBOOT_MAKE_TARGET_pn-u-boot-imx_mx7 = "u-boot.imx"
+UBOOT_SUFFIX_pn-u-boot-imx_mx6 = "imx"
+UBOOT_SUFFIX_pn-u-boot-imx_mx7 = "imx"
 
 # Avoid multiple runtime providers for u-boot-default-env
 PREFERRED_RPROVIDER_u-boot-default-env ??= "${IMX_DEFAULT_BOOTLOADER}"