diff --git a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
index 2ab665e48a..39db1e38c8 100644
--- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
+++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
@@ -123,10 +123,10 @@ IMAGE_BOOT_FILES:intel-corei7-64 = "${@bb.utils.contains('WKS_FILE', 'image-efi-
 # Common for iMX targets
 ## Prefer IMX_DEFAULT_BSP=nxp as mainline removes every common machine override
 IMX_DEFAULT_BSP = "nxp"
-OSTREE_KERNEL_ARGS:mx6 ?= "console=tty1 console=ttymxc0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
-OSTREE_KERNEL_ARGS:mx6ull ?= "console=tty1 console=ttymxc0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
-OSTREE_KERNEL_ARGS:mx7d ?= "console=tty1 console=ttymxc0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
-OSTREE_KERNEL_ARGS:mx7ulp ?= "console=tty1 console=ttyLP0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
+OSTREE_KERNEL_ARGS:mx6-generic-bsp ?= "console=tty1 console=ttymxc0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
+OSTREE_KERNEL_ARGS:mx6ull-generic-bsp ?= "console=tty1 console=ttymxc0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
+OSTREE_KERNEL_ARGS:mx7d-generic-bsp ?= "console=tty1 console=ttymxc0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
+OSTREE_KERNEL_ARGS:mx7ulp-generic-bsp ?= "console=tty1 console=ttyLP0,115200 ${OSTREE_KERNEL_ARGS_COMMON}"
 
 # Embedded Artists i.MX7ULP COM
 UBOOT_SIGN_ENABLE:sota:imx7ulpea-ucom = "1"
@@ -146,26 +146,26 @@ UBOOT_CONFIG:imx7ulpea-ucom = ""
 KERNEL_BUILTIN_WIREGUARD:imx7ulpea-ucom = "1"
 
 # iMX6UL
-UBOOT_SIGN_ENABLE:sota:mx6ul = "1"
-PREFERRED_PROVIDER_virtual/kernel:mx6ul ?= "linux-lmp-fslc-imx"
-IMX_DEFAULT_BOOTLOADER:mx6ul ?= "u-boot-fio"
-WKS_FILE_DEPENDS:append:mx6ul = " u-boot-default-script"
-PREFERRED_PROVIDER_u-boot-default-script:mx6ul = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script:sota:mx6ul = "u-boot-ostree-scr-fit"
-SPL_BINARY:mx6ul = "SPL"
-UBOOT_CLASSES:mx6ul = "uboot-fitimage"
-UBOOT_CONFIG:mx6ul = ""
-UBOOT_SUFFIX:mx6ul = "bin"
-UBOOT_MAKE_TARGET:mx6ul = ""
-UBOOT_DTB_LOADADDRESS:mx6ul = "0x85800000"
-UBOOT_RD_LOADADDRESS:mx6ul = "0x84000000"
-MACHINE_FEATURES:append:mx6ul = " optee"
-LMP_BOOT_FIRMWARE_FILES:mx6ul = "SPL u-boot.itb"
-IMAGE_BOOT_FILES:sota:mx6ul = " boot.itb"
-IMAGE_BOOT_FILES:mx6ul = " boot.scr uEnv.txt zImage"
-KERNEL_IMAGETYPE:sota:mx6ul = "fitImage"
-KERNEL_CLASSES:sota:mx6ul = " kernel-lmp-fitimage "
-WKS_FILE_mx6ul:sota = "sdimage-imx6-spl-fit-sota.wks"
+UBOOT_SIGN_ENABLE:sota:mx6ul-generic-bsp = "1"
+PREFERRED_PROVIDER_virtual/kernel:mx6ul-nxp-bsp ?= "linux-lmp-fslc-imx"
+IMX_DEFAULT_BOOTLOADER:mx6ul-generic-bsp ?= "u-boot-fio"
+WKS_FILE_DEPENDS:append:mx6ul-generic-bsp = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script:mx6ul-generic-bsp = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script:sota:mx6ul-generic-bsp = "u-boot-ostree-scr-fit"
+SPL_BINARY:mx6ul-generic-bsp = "SPL"
+UBOOT_CLASSES:mx6ul-generic-bsp = "uboot-fitimage"
+UBOOT_CONFIG:mx6ul-generic-bsp = ""
+UBOOT_SUFFIX:mx6ul-generic-bsp = "bin"
+UBOOT_MAKE_TARGET:mx6ul-generic-bsp = ""
+UBOOT_DTB_LOADADDRESS:mx6ul-generic-bsp = "0x85800000"
+UBOOT_RD_LOADADDRESS:mx6ul-generic-bsp = "0x84000000"
+MACHINE_FEATURES:append:mx6ul-generic-bsp = " optee"
+LMP_BOOT_FIRMWARE_FILES:mx6ul-generic-bsp = "SPL u-boot.itb"
+IMAGE_BOOT_FILES:sota:mx6ul-generic-bsp = " boot.itb"
+IMAGE_BOOT_FILES:mx6ul-generic-bsp = " boot.scr uEnv.txt zImage"
+KERNEL_IMAGETYPE:sota:mx6ul-generic-bsp = "fitImage"
+KERNEL_CLASSES:sota:mx6ul-generic-bsp = " kernel-lmp-fitimage "
+WKS_FILE:mx6ul-generic-bsp:sota = "sdimage-imx6-spl-fit-sota.wks"
 # iMX6UL EVK
 SOTA_CLIENT_FEATURES:append:imx6ulevk = " ubootenv"
 UBOOT_MACHINE:imx6ulevk = "mx6ul_14x14_evk_defconfig"
@@ -173,26 +173,26 @@ KERNEL_DEVICETREE:imx6ulevk = "imx6ul-14x14-evk.dtb"
 BOOTSCR_LOAD_ADDR:imx6ulevk = "0x85000000"
 
 # iMX6ULL
-UBOOT_SIGN_ENABLE:sota:mx6ull = "1"
-PREFERRED_PROVIDER_virtual/kernel:mx6ull ?= "linux-lmp-fslc-imx"
-IMX_DEFAULT_BOOTLOADER:mx6ull ?= "u-boot-fio"
-WKS_FILE_DEPENDS:append:mx6ull = " u-boot-default-script"
-PREFERRED_PROVIDER_u-boot-default-script:mx6ull = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script:sota:mx6ull = "u-boot-ostree-scr-fit"
-SPL_BINARY:mx6ull = "SPL"
-UBOOT_CLASSES:mx6ull = "uboot-fitimage"
-UBOOT_CONFIG:mx6ull = ""
-UBOOT_SUFFIX:mx6ull = "bin"
-UBOOT_MAKE_TARGET:mx6ull = ""
-UBOOT_DTB_LOADADDRESS:mx6ull = "0x85800000"
-UBOOT_RD_LOADADDRESS:mx6ull = "0x84000000"
-MACHINE_FEATURES:append:mx6ull = " optee"
-LMP_BOOT_FIRMWARE_FILES:mx6ull = "SPL u-boot.itb"
-IMAGE_BOOT_FILES:sota:mx6ull = " boot.itb"
-IMAGE_BOOT_FILES:mx6ull = " boot.scr uEnv.txt zImage ${@make_dtb_boot_files(d)}"
-KERNEL_IMAGETYPE:sota:mx6ull = "fitImage"
-KERNEL_CLASSES:sota:mx6ull = " kernel-lmp-fitimage "
-WKS_FILE_mx6ull:sota = "sdimage-imx6-spl-fit-sota.wks"
+UBOOT_SIGN_ENABLE:sota:mx6ull-generic-bsp = "1"
+PREFERRED_PROVIDER_virtual/kernel:mx6ull-nxp-bsp ?= "linux-lmp-fslc-imx"
+IMX_DEFAULT_BOOTLOADER:mx6ull-generic-bsp ?= "u-boot-fio"
+WKS_FILE_DEPENDS:append:mx6ull-generic-bsp = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script:mx6ull-generic-bsp = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script:sota:mx6ull-generic-bsp = "u-boot-ostree-scr-fit"
+SPL_BINARY:mx6ull-generic-bsp = "SPL"
+UBOOT_CLASSES:mx6ull-generic-bsp = "uboot-fitimage"
+UBOOT_CONFIG:mx6ull-generic-bsp = ""
+UBOOT_SUFFIX:mx6ull-generic-bsp = "bin"
+UBOOT_MAKE_TARGET:mx6ull-generic-bsp = ""
+UBOOT_DTB_LOADADDRESS:mx6ull-generic-bsp = "0x85800000"
+UBOOT_RD_LOADADDRESS:mx6ull-generic-bsp = "0x84000000"
+MACHINE_FEATURES:append:mx6ull-generic-bsp = " optee"
+LMP_BOOT_FIRMWARE_FILES:mx6ull-generic-bsp = "SPL u-boot.itb"
+IMAGE_BOOT_FILES:sota:mx6ull-generic-bsp = " boot.itb"
+IMAGE_BOOT_FILES:mx6ull-generic-bsp = " boot.scr uEnv.txt zImage ${@make_dtb_boot_files(d)}"
+KERNEL_IMAGETYPE:sota:mx6ull-generic-bsp = "fitImage"
+KERNEL_CLASSES:sota:mx6ull-generic-bsp = " kernel-lmp-fitimage "
+WKS_FILE:mx6ull-generic-bsp:sota = "sdimage-imx6-spl-fit-sota.wks"
 # iMX6ULL EVK
 SOTA_CLIENT_FEATURES:append:imx6ullevk = " ubootenv"
 UBOOT_MACHINE:imx6ullevk = "mx6ull_14x14_evk_defconfig"
@@ -211,6 +211,8 @@ KERNEL_IMAGETYPE:sota:apalis-imx6 = "fitImage"
 KERNEL_CLASSES:sota:apalis-imx6 = " kernel-lmp-fitimage "
 OSTREE_KERNEL_ARGS:apalis-imx6 ?= "console=tty1 console=ttymxc0,115200 root=/dev/mmcblk2p2 rootfstype=ext4"
 PREFERRED_PROVIDER_virtual/kernel:apalis-imx6 ?= "linux-lmp"
+KBUILD_DEFCONFIG:apalis-imx6 = ""
+KERNEL_DEVICETREE:remove:apalis-imx6 = "imx6q-apalis-ixora-v1.2.dtb"
 IMX_DEFAULT_BOOTLOADER:apalis-imx6 ?= "u-boot-fio"
 SOTA_CLIENT_FEATURES:append:apalis-imx6 = " ubootenv"
 UBOOT_CONFIG:apalis-imx6 = ""
@@ -228,27 +230,27 @@ BOOTSCR_LOAD_ADDR:apalis-imx6 = "0x15000000"
 SOTA_CLIENT_FEATURES:remove:sota:apalis-imx6-sec = "ubootenv"
 
 # iMX8QM
-SOTA_CLIENT_FEATURES:append:mx8qm = " ubootenv"
-IMAGE_BOOT_FILES:mx8qm = "imx-boot u-boot.itb hdmitxfw.bin ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
-IMAGE_BOOT_FILES:sota:mx8qm = "imx-boot u-boot.itb"
-LMP_BOOT_FIRMWARE_FILES:mx8qm = "imx-boot u-boot.itb"
-BOOTSCR_LOAD_ADDR:mx8qm = "0x83100000"
-KERNEL_IMAGETYPE:sota:mx8qm = "fitImage"
-KERNEL_CLASSES:sota:mx8qm = " kernel-lmp-fitimage "
-FIT_LOADABLES:mx8qm ?= "hdmitxfw.bin"
-WKS_FILE:mx8qm:sota = "sdimage-imx8-sota.wks.in"
-IMX_DEFAULT_BOOTLOADER:mx8qm ?= "u-boot-fio"
-WKS_FILE_DEPENDS:append:mx8qm = " u-boot-default-script"
-PREFERRED_PROVIDER_u-boot-default-script:mx8qm = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script:sota:mx8qm = "u-boot-ostree-scr-fit"
-UBOOT_CLASSES:mx8qm = "uboot-fitimage"
-IMXBOOT_TARGETS:mx8qm = "flash_evk_spl"
-ATF_BINARY:mx8qm = "arm-trusted-firmware.bin"
-EXTRA_IMAGEDEPENDS:append:mx8qm = "virtual/trusted-firmware-a"
-UBOOT_ENTRYPOINT:mx8qm = "0x80280000"
-UBOOT_LOADADDRESS:mx8qm = "0x80280000"
-UBOOT_DTB_LOADADDRESS:mx8qm = "0x83000000"
-UBOOT_SIGN_ENABLE:sota:mx8qm = "1"
+SOTA_CLIENT_FEATURES:append:mx8qm-generic-bsp = " ubootenv"
+IMAGE_BOOT_FILES:mx8qm-nxp-bsp = "imx-boot u-boot.itb hdmitxfw.bin ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
+IMAGE_BOOT_FILES:sota:mx8qm-nxp-bsp = "imx-boot u-boot.itb"
+LMP_BOOT_FIRMWARE_FILES:mx8qm-nxp-bsp = "imx-boot u-boot.itb"
+BOOTSCR_LOAD_ADDR:mx8qm-generic-bsp = "0x83100000"
+KERNEL_IMAGETYPE:sota:mx8qm-generic-bsp = "fitImage"
+KERNEL_CLASSES:sota:mx8qm-generic-bsp = " kernel-lmp-fitimage "
+FIT_LOADABLES:mx8qm-generic-bsp ?= "hdmitxfw.bin"
+WKS_FILE:mx8qm-nxp-bsp:sota = "sdimage-imx8-sota.wks.in"
+IMX_DEFAULT_BOOTLOADER:mx8qm-generic-bsp ?= "u-boot-fio"
+WKS_FILE_DEPENDS:append:mx8qm-generic-bsp = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script:mx8qm-generic-bsp = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script:sota:mx8qm-generic-bsp = "u-boot-ostree-scr-fit"
+UBOOT_CLASSES:mx8qm-generic-bsp = "uboot-fitimage"
+IMXBOOT_TARGETS:mx8qm-nxp-bsp = "flash_evk_spl"
+ATF_BINARY:mx8qm-generic-bsp = "arm-trusted-firmware.bin"
+EXTRA_IMAGEDEPENDS:append:mx8qm-generic-bsp = "virtual/trusted-firmware-a"
+UBOOT_ENTRYPOINT:mx8qm-generic-bsp = "0x80280000"
+UBOOT_LOADADDRESS:mx8qm-generic-bsp = "0x80280000"
+UBOOT_DTB_LOADADDRESS:mx8qm-generic-bsp = "0x83000000"
+UBOOT_SIGN_ENABLE:sota:mx8qm-generic-bsp = "1"
 ## iMX8QM MEK
 OSTREE_KERNEL_ARGS:imx8qm-mek ?= "pci=nomsi console=ttyLP0,115200 earlycon ${OSTREE_KERNEL_ARGS_COMMON}"
 PREFERRED_PROVIDER_virtual/kernel:imx8qm-mek ?= "linux-lmp-fslc-imx"
@@ -256,7 +258,7 @@ KERNEL_DANGLING_FEATURES_WARN_ONLY:imx8qm-mek ?= "1"
 UBOOT_CONFIG:imx8qm-mek = ""
 UBOOT_SUFFIX:imx8qm-mek = "bin"
 UBOOT_MACHINE:imx8qm-mek = "imx8qm_mek_defconfig"
-UBOOT_DTB_NAME ?= "fsl-imx8qm-mek.dtb"
+UBOOT_DTB_NAME:imx8qm-mek ?= "fsl-imx8qm-mek.dtb"
 ## Toradex Apalis iMX8QM
 OSTREE_KERNEL_ARGS:apalis-imx8 ?= "pci=nomsi console=tty1 console=ttyLP1,115200 earlycon ${OSTREE_KERNEL_ARGS_COMMON}"
 PREFERRED_PROVIDER_virtual/kernel:apalis-imx8 ?= "linux-lmp-toradex-imx"
@@ -268,26 +270,26 @@ UBOOT_MACHINE:apalis-imx8 = "apalis-imx8_defconfig"
 SOTA_CLIENT_FEATURES:remove:sota:apalis-imx8-sec = "ubootenv"
 
 # iMX8MQ
-UBOOT_SIGN_ENABLE:sota:mx8mq = "1"
-IMX_DEFAULT_BOOTLOADER:mx8mq ?= "u-boot-fio"
-UBOOT_DTB_LOADADDRESS:mx8mq = "0x43000000"
-PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mq ?= "imx-atf"
-EXTRA_IMAGEDEPENDS:append:mx8mq = "virtual/trusted-firmware-a"
-UBOOT_CLASSES:mx8mq = "uboot-fitimage"
-ATF_BINARY:mx8mq = "arm-trusted-firmware.bin"
-UBOOT_CONFIG:mx8mq = ""
-LMP_BOOT_FIRMWARE_FILES:mx8mq = "imx-boot imx-boot-nohdmi u-boot.itb"
-IMAGE_BOOT_FILES:mx8mq = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
-IMAGE_BOOT_FILES:sota:mx8mq = "imx-boot u-boot.itb boot.itb"
-WKS_FILE_DEPENDS:append:mx8mq = " u-boot-default-script"
-PREFERRED_PROVIDER_u-boot-default-script:mx8mq = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script:sota:mx8mq = "u-boot-ostree-scr-fit"
-KERNEL_IMAGETYPE:sota:mx8mq = "fitImage"
-KERNEL_CLASSES:sota:mx8mq = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:sota:mx8mq-generic-bsp = "1"
+IMX_DEFAULT_BOOTLOADER:mx8mq-generic-bsp ?= "u-boot-fio"
+UBOOT_DTB_LOADADDRESS:mx8mq-generic-bsp = "0x43000000"
+PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mq-nxp-bsp ?= "imx-atf"
+EXTRA_IMAGEDEPENDS:append:mx8mq-generic-bsp = "virtual/trusted-firmware-a"
+UBOOT_CLASSES:mx8mq-generic-bsp = "uboot-fitimage"
+ATF_BINARY:mx8mq-generic-bsp = "arm-trusted-firmware.bin"
+UBOOT_CONFIG:mx8mq-generic-bsp = ""
+LMP_BOOT_FIRMWARE_FILES:mx8mq-nxp-bsp = "imx-boot imx-boot-nohdmi u-boot.itb"
+IMAGE_BOOT_FILES:mx8mq-nxp-bsp = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
+IMAGE_BOOT_FILES:sota:mx8mq-nxp-bsp = "imx-boot u-boot.itb boot.itb"
+WKS_FILE_DEPENDS:append:mx8mq-generic-bsp = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script:mx8mq-generic-bsp = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script:sota:mx8mq-generic-bsp = "u-boot-ostree-scr-fit"
+KERNEL_IMAGETYPE:sota:mx8mq-generic-bsp = "fitImage"
+KERNEL_CLASSES:sota:mx8mq-generic-bsp = " kernel-lmp-fitimage "
 ## iMX8: Use latest NXP BSP downstream kernel
-PREFERRED_PROVIDER_virtual/kernel:mx8mq ?= "linux-lmp-fslc-imx"
-WKS_FILE:sota:mx8mq = "sdimage-imx8-spl-sota.wks.in"
-IMXBOOT_TARGETS:mx8mq = "flash_evk_spl"
+PREFERRED_PROVIDER_virtual/kernel:mx8mq-nxp-bsp ?= "linux-lmp-fslc-imx"
+WKS_FILE:sota:mx8mq-nxp-bsp = "sdimage-imx8-spl-sota.wks.in"
+IMXBOOT_TARGETS:mx8mq-nxp-bsp = "flash_evk_spl"
 ## iMX8MQ EVK
 KMACHINE:imx8mq-evk = "imx8mqevk"
 OSTREE_KERNEL_ARGS:imx8mq-evk ?= "console=tty1 console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 root=/dev/mmcblk0p2 rootfstype=ext4"
@@ -306,27 +308,27 @@ IMAGE_EFI_BOOT_FILES:sota:imx8mq-evk-ebbr ?= "${@make_efi_dtb_boot_files(d)}"
 WKS_FILE:sota:imx8mq-evk-ebbr ?= "efidisk-sota.wks"
 
 # iMX8MM
-UBOOT_SIGN_ENABLE:sota:mx8mm = "1"
-IMX_DEFAULT_BOOTLOADER:mx8mm ?= "u-boot-fio"
-UBOOT_DTB_LOADADDRESS:mx8mm = "0x43000000"
-PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mm ?= "imx-atf"
-EXTRA_IMAGEDEPENDS:append:mx8mm = "virtual/trusted-firmware-a"
-UBOOT_CLASSES:mx8mm = "uboot-fitimage"
-ATF_BINARY:mx8mm = "arm-trusted-firmware.bin"
-UBOOT_CONFIG:mx8mm = ""
-LMP_BOOT_FIRMWARE_FILES:mx8mm = "imx-boot u-boot.itb"
-IMAGE_BOOT_FILES:mx8mm = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
-IMAGE_BOOT_FILES:sota:mx8mm = "boot.itb"
-WKS_FILE_DEPENDS:append:mx8mm = " u-boot-default-script"
-PREFERRED_PROVIDER_u-boot-default-script:mx8mm = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script:sota:mx8mm = "u-boot-ostree-scr-fit"
-KERNEL_IMAGETYPE:sota:mx8mm = "fitImage"
-KERNEL_CLASSES:sota:mx8mm = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:sota:mx8mm-generic-bsp = "1"
+IMX_DEFAULT_BOOTLOADER:mx8mm-nxp-bsp ?= "u-boot-fio"
+UBOOT_DTB_LOADADDRESS:mx8mm-generic-bsp = "0x43000000"
+PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mm-nxp-bsp ?= "imx-atf"
+EXTRA_IMAGEDEPENDS:append:mx8mm-nxp-bsp = "virtual/trusted-firmware-a"
+UBOOT_CLASSES:mx8mm-generic-bsp = "uboot-fitimage"
+ATF_BINARY:mx8mm-generic-bsp = "arm-trusted-firmware.bin"
+UBOOT_CONFIG:mx8mm-generic-bsp = ""
+LMP_BOOT_FIRMWARE_FILES:mx8mm-nxp-bsp = "imx-boot u-boot.itb"
+IMAGE_BOOT_FILES:mx8mm-nxp-bsp = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
+IMAGE_BOOT_FILES:sota:mx8mm-nxp-bsp = "boot.itb"
+WKS_FILE_DEPENDS:append:mx8mm-generic-bsp = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script:mx8mm-generic-bsp = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script:sota:mx8mm-generic-bsp = "u-boot-ostree-scr-fit"
+KERNEL_IMAGETYPE:sota:mx8mm-generic-bsp = "fitImage"
+KERNEL_CLASSES:sota:mx8mm-generic-bsp = " kernel-lmp-fitimage "
 ## iMX8: Use latest NXP BSP downstream kernel
-PREFERRED_PROVIDER_virtual/kernel:mx8mm ?= "linux-lmp-fslc-imx"
-MACHINE_FIRMWARE:mx8mm = "linux-firmware-imx-sdma-imx7d"
-WKS_FILE:sota:mx8mm = "sdimage-imx8-spl-sota.wks.in"
-IMXBOOT_TARGETS:mx8mm = "flash_evk_spl"
+PREFERRED_PROVIDER_virtual/kernel:mx8mm-nxp-bsp ?= "linux-lmp-fslc-imx"
+MACHINE_FIRMWARE:mx8mm-nxp-bsp = "linux-firmware-imx-sdma-imx7d"
+WKS_FILE:sota:mx8mm-nxp-bsp = "sdimage-imx8-spl-sota.wks.in"
+IMXBOOT_TARGETS:mx8mm-nxp-bsp = "flash_evk_spl"
 ## iMX8MM EVK
 KERNEL_DEVICETREE:append:imx8mm-lpddr4-evk = " freescale/imx8mm-evkb.dtb"
 KMACHINE:imx8mm-lpddr4-evk = "imx8mmevk"
@@ -349,27 +351,27 @@ WKS_FILE:sota:imx8mm-lpddr4-evk-ebbr ?= "efidisk-sota.wks"
 MACHINE_FEATURES:append:imx8mm-lpddr4-evk = " nxp89xx mxm-mwifiex-load"
 
 # iMX8MP
-UBOOT_SIGN_ENABLE:sota:mx8mp = "1"
-IMX_DEFAULT_BOOTLOADER:mx8mp ?= "u-boot-fio"
-UBOOT_DTB_LOADADDRESS:mx8mp = "0x43000000"
-PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mp ?= "imx-atf"
-EXTRA_IMAGEDEPENDS:append:mx8mp = "virtual/trusted-firmware-a"
-UBOOT_CLASSES:mx8mp = "uboot-fitimage"
-ATF_BINARY:mx8mp = "arm-trusted-firmware.bin"
-UBOOT_CONFIG:mx8mp = ""
-LMP_BOOT_FIRMWARE_FILES:mx8mp = "imx-boot u-boot.itb"
-IMAGE_BOOT_FILES:mx8mp = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
-IMAGE_BOOT_FILES:sota:mx8mp = "boot.itb"
-WKS_FILE_DEPENDS:append:mx8mp = " u-boot-default-script"
-PREFERRED_PROVIDER_u-boot-default-script:mx8mp = "u-boot-base-scr"
-PREFERRED_PROVIDER_u-boot-default-script:sota:mx8mp = "u-boot-ostree-scr-fit"
-KERNEL_IMAGETYPE:sota:mx8mp = "fitImage"
-KERNEL_CLASSES:sota:mx8mp = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:sota:mx8mp-generic-bsp = "1"
+IMX_DEFAULT_BOOTLOADER:mx8mp-nxp-bsp ?= "u-boot-fio"
+UBOOT_DTB_LOADADDRESS:mx8mp-generic-bsp = "0x43000000"
+PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mp-nxp-bsp ?= "imx-atf"
+EXTRA_IMAGEDEPENDS:append:mx8mp-nxp-bsp = "virtual/trusted-firmware-a"
+UBOOT_CLASSES:mx8mp-generic-bsp = "uboot-fitimage"
+ATF_BINARY:mx8mp-generic-bsp = "arm-trusted-firmware.bin"
+UBOOT_CONFIG:mx8mp-generic-bsp = ""
+LMP_BOOT_FIRMWARE_FILES:mx8mp-nxp-bsp = "imx-boot u-boot.itb"
+IMAGE_BOOT_FILES:mx8mp-nxp-bsp = "imx-boot u-boot.itb ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
+IMAGE_BOOT_FILES:sota:mx8mp-nxp-bsp = "boot.itb"
+WKS_FILE_DEPENDS:append:mx8mp-generic-bsp = " u-boot-default-script"
+PREFERRED_PROVIDER_u-boot-default-script:mx8mp-generic-bsp = "u-boot-base-scr"
+PREFERRED_PROVIDER_u-boot-default-script:sota:mx8mp-generic-bsp = "u-boot-ostree-scr-fit"
+KERNEL_IMAGETYPE:sota:mx8mp-generic-bsp = "fitImage"
+KERNEL_CLASSES:sota:mx8mp-generic-bsp = " kernel-lmp-fitimage "
 ## iMX8: Use latest NXP BSP downstream kernel
-PREFERRED_PROVIDER_virtual/kernel:mx8mp ?= "linux-lmp-fslc-imx"
-MACHINE_FIRMWARE:mx8mp = "linux-firmware-imx-sdma-imx7d"
-WKS_FILE:sota:mx8mp = "sdimage-imx8-spl-sota.wks.in"
-IMXBOOT_TARGETS:mx8mp = "flash_evk_spl"
+PREFERRED_PROVIDER_virtual/kernel:mx8mp-nxp-bsp ?= "linux-lmp-fslc-imx"
+MACHINE_FIRMWARE:mx8mp-nxp-bsp = "linux-firmware-imx-sdma-imx7d"
+WKS_FILE:sota:mx8mp-nxp-bsp = "sdimage-imx8-spl-sota.wks.in"
+IMXBOOT_TARGETS:mx8mp-nxp-bsp = "flash_evk_spl"
 ## iMX8MP EVK
 OSTREE_KERNEL_ARGS:imx8mp-lpddr4-evk ?= "console=tty1 console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200 root=/dev/mmcblk2p2 rootfstype=ext4"
 SOTA_CLIENT_FEATURES:append:imx8mp-lpddr4-evk = " ubootenv"
@@ -508,12 +510,14 @@ OSTREE_KERNEL_ARGS:sun8i ?= "earlycon console=ttyS0,115200 ${OSTREE_KERNEL_ARGS_
 
 # Cross machines / BSPs
 ## iMX targets should use the u-boot release based on the NXP BSP
-PREFERRED_VERSION_u-boot-fio:imx ?= "2021.04"
+PREFERRED_VERSION_u-boot-fio:imx-nxp-bsp ?= "2021.04"
 ## Prefer OP-TEE releases from our layer instead of using the .imx fork
-PREFERRED_VERSION_optee-client:mx8 = "3.17.0"
-PREFERRED_VERSION_optee-examples:mx8 = "3.17.0"
-PREFERRED_VERSION_optee-test:mx8 = "3.17.0"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp = "3.17.0"
+PREFERRED_VERSION_optee-examples:mx8-nxp-bsp = "3.17.0"
+PREFERRED_VERSION_optee-test:mx8-nxp-bsp = "3.17.0"
+## We don't use imx-boot-container just yet
+UBOOT_PROVIDES_BOOT_CONTAINER:mx8-generic-bsp = ""
 ## No need to install u-boot, already a WKS dependency
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove:imx = "u-boot-fslc"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove:imx-generic-bsp = "u-boot-fslc"
 ## OP-TEE is a dependency of u-boot (fit), no need for WKS_FILE_DEPENDS
-OPTEE_WKS_FILE_DEPENDS:imx = ""
+OPTEE_WKS_FILE_DEPENDS:imx-generic-bsp = ""
diff --git a/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc
index a3792e9b98..a27061cf18 100644
--- a/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc
+++ b/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc
@@ -14,51 +14,51 @@ KERNEL_IMAGETYPE:imx7ulpea-ucom = "fitImage"
 KERNEL_CLASSES:imx7ulpea-ucom = " kernel-lmp-fitimage "
 
 # iMX6UL
-UBOOT_SIGN_ENABLE:mx6ul = "1"
-PREFERRED_PROVIDER_virtual/kernel:mx6ul = "linux-lmp-dev-mfgtool"
-IMX_DEFAULT_BOOTLOADER:mx6ul ?= "u-boot-fio-mfgtool"
-PREFERRED_PROVIDER_u-boot-default-script:mx6ul = "u-boot-ostree-scr-fit"
-UBOOT_CLASSES:mx6ul = "uboot-fitimage"
-IMAGE_BOOT_FILES:remove:mx6ul = "boot.scr uEnv.txt zImage"
-IMAGE_BOOT_FILES:append:mx6ul = " boot.itb SPL u-boot.itb"
-KERNEL_IMAGETYPE:mx6ul = "fitImage"
-KERNEL_CLASSES:mx6ul = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:mx6ul-generic-bsp = "1"
+PREFERRED_PROVIDER_virtual/kernel:mx6ul-nxp-bsp = "linux-lmp-dev-mfgtool"
+IMX_DEFAULT_BOOTLOADER:mx6ul-generic-bsp ?= "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script:mx6ul-generic-bsp = "u-boot-ostree-scr-fit"
+UBOOT_CLASSES:mx6ul-generic-bsp = "uboot-fitimage"
+IMAGE_BOOT_FILES:remove:mx6ul-generic-bsp = "boot.scr uEnv.txt zImage"
+IMAGE_BOOT_FILES:append:mx6ul-generic-bsp = " boot.itb SPL u-boot.itb"
+KERNEL_IMAGETYPE:mx6ul-generic-bsp = "fitImage"
+KERNEL_CLASSES:mx6ul-generic-bsp = " kernel-lmp-fitimage "
 
 # iMX6ULL
-UBOOT_SIGN_ENABLE:mx6ull = "1"
-PREFERRED_PROVIDER_virtual/kernel:mx6ull = "linux-lmp-dev-mfgtool"
-IMX_DEFAULT_BOOTLOADER:mx6ull ?= "u-boot-fio-mfgtool"
-PREFERRED_PROVIDER_u-boot-default-script:mx6ull = "u-boot-ostree-scr-fit"
-UBOOT_CLASSES:mx6ull = "uboot-fitimage"
-IMAGE_BOOT_FILES:remove:mx6ull = "boot.scr uEnv.txt zImage"
-IMAGE_BOOT_FILES:append:mx6ull = " boot.itb SPL u-boot.itb"
-KERNEL_IMAGETYPE:mx6ull = "fitImage"
-KERNEL_CLASSES:mx6ull = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:mx6ull-generic-bsp = "1"
+PREFERRED_PROVIDER_virtual/kernel:mx6ull-nxp-bsp = "linux-lmp-dev-mfgtool"
+IMX_DEFAULT_BOOTLOADER:mx6ull-generic-bsp ?= "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script:mx6ull-generic-bsp = "u-boot-ostree-scr-fit"
+UBOOT_CLASSES:mx6ull-generic-bsp = "uboot-fitimage"
+IMAGE_BOOT_FILES:remove:mx6ull-generic-bsp = "boot.scr uEnv.txt zImage"
+IMAGE_BOOT_FILES:append:mx6ull-generic-bsp = " boot.itb SPL u-boot.itb"
+KERNEL_IMAGETYPE:mx6ull-generic-bsp = "fitImage"
+KERNEL_CLASSES:mx6ull-generic-bsp = " kernel-lmp-fitimage "
 
 # iMX8MQ
-UBOOT_SIGN_ENABLE:mx8mq = "1"
-PREFERRED_PROVIDER_virtual/kernel:mx8mq = "linux-lmp-dev-mfgtool"
-IMX_DEFAULT_BOOTLOADER:mx8mq ?= "u-boot-fio-mfgtool"
-PREFERRED_PROVIDER_u-boot-default-script:mx8mq = "u-boot-ostree-scr-fit"
-IMAGE_BOOT_FILES:mx8mq  = "imx-boot u-boot.itb boot.itb"
-KERNEL_IMAGETYPE:mx8mq = "fitImage"
-KERNEL_CLASSES:mx8mq = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:mx8mq-generic-bsp = "1"
+PREFERRED_PROVIDER_virtual/kernel:mx8mq-nxp-bsp = "linux-lmp-dev-mfgtool"
+IMX_DEFAULT_BOOTLOADER:mx8mq-generic-bsp ?= "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script:mx8mq-generic-bsp = "u-boot-ostree-scr-fit"
+IMAGE_BOOT_FILES:mx8mq-nxp-bsp  = "imx-boot u-boot.itb boot.itb"
+KERNEL_IMAGETYPE:mx8mq-generic-bsp = "fitImage"
+KERNEL_CLASSES:mx8mq-generic-bsp = " kernel-lmp-fitimage "
 
 # iMX8MPEVK
-UBOOT_SIGN_ENABLE:mx8mp = "1"
-IMX_DEFAULT_BOOTLOADER:mx8mp ?= "u-boot-fio-mfgtool"
-PREFERRED_PROVIDER_u-boot-default-script:mx8mp = "u-boot-ostree-scr"
-IMAGE_BOOT_FILES:mx8mp  = "imx-boot u-boot.itb boot.itb"
-KERNEL_IMAGETYPE:mx8mp = "fitImage"
-KERNEL_CLASSES:mx8mp = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:mx8mp-generic-bsp = "1"
+IMX_DEFAULT_BOOTLOADER:mx8mp-generic-bsp ?= "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script:mx8mp-generic-bsp = "u-boot-ostree-scr"
+IMAGE_BOOT_FILES:mx8mp-nxp-bsp  = "imx-boot u-boot.itb boot.itb"
+KERNEL_IMAGETYPE:mx8mp-generic-bsp = "fitImage"
+KERNEL_CLASSES:mx8mp-generic-bsp = " kernel-lmp-fitimage "
 
 # iMX8MM
-UBOOT_SIGN_ENABLE:mx8mm = "1"
-IMX_DEFAULT_BOOTLOADER:mx8mm ?= "u-boot-fio-mfgtool"
-PREFERRED_PROVIDER_u-boot-default-script:mx8mm = "u-boot-ostree-scr"
-IMAGE_BOOT_FILES:mx8mm  = "imx-boot u-boot.itb boot.itb"
-KERNEL_IMAGETYPE:mx8mm = "fitImage"
-KERNEL_CLASSES:mx8mm = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:mx8mm-generic-bsp = "1"
+IMX_DEFAULT_BOOTLOADER:mx8mm-generic-bsp ?= "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script:mx8mm-generic-bsp = "u-boot-ostree-scr"
+IMAGE_BOOT_FILES:mx8mm-nxp-bsp  = "imx-boot u-boot.itb boot.itb"
+KERNEL_IMAGETYPE:mx8mm-generic-bsp = "fitImage"
+KERNEL_CLASSES:mx8mm-generic-bsp = " kernel-lmp-fitimage "
 
 # Apalis-iMX6
 UBOOT_SIGN_ENABLE:apalis-imx6 = "1"
@@ -71,10 +71,10 @@ KERNEL_IMAGETYPE:apalis-imx6 = "fitImage"
 KERNEL_CLASSES:apalis-imx6 = " kernel-lmp-fitimage "
 
 # iMX8QM-MEK and Apalis-iMX8
-IMX_DEFAULT_BOOTLOADER:mx8qm ?= "u-boot-fio-mfgtool"
-PREFERRED_PROVIDER_u-boot-default-script:mx8qm = "u-boot-ostree-scr-fit"
-KERNEL_IMAGETYPE:mx8qm = "fitImage"
-KERNEL_CLASSES:mx8qm = " kernel-lmp-fitimage "
-UBOOT_SIGN_ENABLE:mx8qm = "1"
-UBOOT_CLASSES:mx8qm = "uboot-fitimage"
-IMAGE_BOOT_FILES:mx8qm  = "imx-boot u-boot.itb boot.itb"
+IMX_DEFAULT_BOOTLOADER:mx8qm-generic-bsp ?= "u-boot-fio-mfgtool"
+PREFERRED_PROVIDER_u-boot-default-script:mx8qm-generic-bsp = "u-boot-ostree-scr-fit"
+KERNEL_IMAGETYPE:mx8qm-generic-bsp = "fitImage"
+KERNEL_CLASSES:mx8qm-generic-bsp = " kernel-lmp-fitimage "
+UBOOT_SIGN_ENABLE:mx8qm-generic-bsp = "1"
+UBOOT_CLASSES:mx8qm-generic-bsp = "uboot-fitimage"
+IMAGE_BOOT_FILES:mx8qm-nxp-bsp  = "imx-boot u-boot.itb boot.itb"
diff --git a/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend b/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
index 89cc7cea77..cc2c9718a8 100644
--- a/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
+++ b/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -19,7 +19,7 @@ SRC_URI:append:toradex = " \
     file://0001-Revert-Add-NXP-s-SoCs-partition-reboot-support.patch \
 "
 
-do_deploy:append:mx8() {
+do_deploy:append:mx8-nxp-bsp() {
     install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31.bin ${DEPLOYDIR}/arm-trusted-firmware.bin
     install -m 0644 ${S}/build-optee/${ATF_PLATFORM}/release/bl31/bl31.elf ${DEPLOYDIR}/arm-trusted-firmware.elf
 }
diff --git a/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend b/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
index 16b11e8d26..51d848e400 100644
--- a/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
+++ b/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
@@ -5,14 +5,14 @@ DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'virtual/optee-os'
 
 SRC_URI:remove = " file://0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch"
 
-SRC_URI:append:mx8m = " \
+SRC_URI:append:mx8m-nxp-bsp = " \
      file://0002-iMX8M-add-SPL-only-build.patch \
      file://0003-iMX8M-add-support-for-packing-HDMI-fw-in-SPL-only-bo.patch \
      file://0004-iMX8M-also-create-nohdmi-boot-image.patch \
      file://0001-iMX8M-change-DDR-DMEM-padding.patch \
 "
 
-SRC_URI:append:mx8qm = " \
+SRC_URI:append:mx8qm-nxp-bsp = " \
      file://0001-iMX8QM-add-SPL-only-build.patch \
 "
 
@@ -23,7 +23,7 @@ do_compile[depends] = " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'virtual/optee-os:do_deploy', '', d)} \
 "
 
-do_compile:prepend:mx8() {
+do_compile:prepend:mx8-nxp-bsp() {
     for target in ${IMXBOOT_TARGETS}; do
         if [ "${target}" = "flash_evk_spl" ]; then
             # copy u-boot-spl-nodtb instead of u-boot-spl.bin as we need to have
diff --git a/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb b/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb
index 830cb77cb7..5d3595e349 100644
--- a/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb
+++ b/meta-lmp-bsp/dynamic-layers/freescale-layer/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb
@@ -22,8 +22,8 @@ RPROVIDES:${PN} = "imx-sc-firmware"
 RCONFLICTS:${PN} = "imx-sc-firmware"
 
 BOARD_TYPE ?= "unknown"
-SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qm-nxp-bsp = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qxp-nxp-bsp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
 symlink_name = "scfw_tcm.bin"
 
 BOOT_TOOLS = "imx-boot-tools"
diff --git a/meta-lmp-bsp/dynamic-layers/xilinx-tools/recipes-bsp/hdf/external-hdf/uz3eg-iocc/system.xsa b/meta-lmp-bsp/dynamic-layers/xilinx-tools/recipes-bsp/hdf/external-hdf/uz3eg-iocc/system.xsa
index 813cd550aa..f8ea09cb8d 100644
Binary files a/meta-lmp-bsp/dynamic-layers/xilinx-tools/recipes-bsp/hdf/external-hdf/uz3eg-iocc/system.xsa and b/meta-lmp-bsp/dynamic-layers/xilinx-tools/recipes-bsp/hdf/external-hdf/uz3eg-iocc/system.xsa differ
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool_%.bbappend b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool_%.bbappend
index d80f513482..f0e5a61503 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool_%.bbappend
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool_%.bbappend
@@ -1,9 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-BOOT_TOOLS:mx8 = "imx-boot-tools"
+BOOT_TOOLS:mx8-nxp-bsp = "imx-boot-tools"
 
 # From u-boot-imx/meta-freescale
-do_deploy:append:mx8() {
+do_deploy:append:mx8-nxp-bsp() {
     # Deploy u-boot-nodtb.bin and XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]; then
         for config in ${UBOOT_MACHINE}; do
@@ -42,4 +42,4 @@ do_deploy:append:mx8() {
 }
 
 # disable branch protection to fix SPL size overrun issue
-TOOLCHAIN_OPTIONS:append:mx8mp = ' -mbranch-protection=none'
+TOOLCHAIN_OPTIONS:append:mx8mp-nxp-bsp = ' -mbranch-protection=none'
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend
index 257515e765..eac5619ce9 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio_%.bbappend
@@ -1,9 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-BOOT_TOOLS:mx8 = "imx-boot-tools"
+BOOT_TOOLS:mx8-nxp-bsp = "imx-boot-tools"
 
 # From u-boot-imx/meta-freescale
-do_deploy:append:mx8() {
+do_deploy:append:mx8-nxp-bsp() {
     # Deploy u-boot-nodtb.bin and XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]; then
         for config in ${UBOOT_MACHINE}; do
diff --git a/meta-lmp-bsp/recipes-graphics/wayland/weston-init.bbappend b/meta-lmp-bsp/recipes-graphics/wayland/weston-init.bbappend
index e3edf8e720..900b645c0f 100644
--- a/meta-lmp-bsp/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-lmp-bsp/recipes-graphics/wayland/weston-init.bbappend
@@ -1,3 +1,3 @@
 # imx weston-init tries to uncomment [shell] for some machines
 # this is already uncommented for lmp-wayland weston.ini so remove here
-INI_UNCOMMENT_ASSIGNMENTS:remove:imx = "\\[shell\\]"
+INI_UNCOMMENT_ASSIGNMENTS:remove:imx-nxp-bsp = "\\[shell\\]"
diff --git a/meta-lmp-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-lmp-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index d4dc66144f..5931a0f77f 100644
--- a/meta-lmp-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/meta-lmp-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -15,7 +15,7 @@ SRC_URI:append = "\
 SRCREV_TIInit_11.8.32 ?= "31a43dc1248a6c19bb886006f8c167e2fd21cb78"
 
 IMX_FIRMWARE_BRANCH ?= "lf-5.10.52_2.1.0"
-SRC_URI:append:imx = "\
+SRC_URI:append:imx-nxp-bsp = "\
     git://github.com/NXP/imx-firmware.git;protocol=https;branch=${IMX_FIRMWARE_BRANCH};destsuffix=imx-firmware;name=imx-firmware; \
 "
 SRCREV_imx-firmware ?= "6d7f77b83164b08334806c4aa2034bc1f7da7b7d"
@@ -40,7 +40,7 @@ do_install:append:beaglebone-yocto() {
     cp ${WORKDIR}/wl18xx-conf.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
 }
 
-do_install:append:imx () {
+do_install:append:imx-nxp-bsp () {
     # Install NXP Connectivity
     install -d ${D}${nonarch_base_libdir}/firmware/nxp
     install -m 0644 ${WORKDIR}/imx-firmware/nxp/wifi_mod_para.conf    ${D}${nonarch_base_libdir}/firmware/nxp
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp-mfgtool.inc b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp-mfgtool.inc
index 4c00e79ea2..7b4f798fa8 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp-mfgtool.inc
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp-mfgtool.inc
@@ -9,12 +9,12 @@ OPTEEMACHINE:imx8mq-evk = "imx-mx8mqevk"
 OPTEEMACHINE:imx8qm-mek = "imx-mx8qmmek"
 
 # SoC Settings
-EXTRA_OEMAKE:append:mx8m = " \
+EXTRA_OEMAKE:append:mx8m-nxp-bsp = " \
     CFG_NXP_CAAM=y CFG_NXP_CAAM_RNG_DRV=y \
     CFG_WITH_SOFTWARE_PRNG=n CFG_CRYPTO_DRIVER=y CFG_RNG_PTA=y \
     CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x43200000 \
 "
-EXTRA_OEMAKE:append:mx8qm = " \
+EXTRA_OEMAKE:append:mx8qm-nxp-bsp = " \
     CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x83200000 \
 "
 
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp.inc b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp.inc
index c3a33ca17b..0f032e0b27 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp.inc
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-bsp.inc
@@ -11,12 +11,12 @@ OPTEEMACHINE:qemuarm64 = "vexpress-qemu_armv8a"
 OPTEEMACHINE:zynqmp = "zynqmp-zcu102"
 
 # SoC Settings
-EXTRA_OEMAKE:append:mx8m = " \
+EXTRA_OEMAKE:append:mx8m-nxp-bsp = " \
     CFG_NXP_CAAM=y CFG_NXP_CAAM_RNG_DRV=y \
     CFG_WITH_SOFTWARE_PRNG=n CFG_CRYPTO_DRIVER=y CFG_RNG_PTA=y \
     CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x43200000 \
 "
-EXTRA_OEMAKE:append:mx8qm = " \
+EXTRA_OEMAKE:append:mx8qm-nxp-bsp = " \
     CFG_DT=y CFG_EXTERNAL_DTB_OVERLAY=y CFG_DT_ADDR=0x83200000 \
 "
 EXTRA_OEMAKE:append:zynqmp = " \
diff --git a/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files_%.bbappend b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files_%.bbappend
index 6b71a34198..65c823ee56 100644
--- a/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files_%.bbappend
+++ b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files_%.bbappend
@@ -32,7 +32,7 @@ SRC_URI:append:imx8mp-lpddr4-evk-sec = " \
 
 # Machine specific dependencies
 def get_do_deploy_depends(d):
-    imxboot_families = ['mx8']
+    imxboot_families = ['mx8-nxp-bsp']
     cur_families = (d.getVar('MACHINEOVERRIDES') or '').split(':')
     if any(map(lambda x: x in cur_families, imxboot_families)):
         return "imx-boot:do_deploy"
@@ -40,7 +40,7 @@ def get_do_deploy_depends(d):
 
 do_deploy[depends] += "${@get_do_deploy_depends(d)}"
 
-do_deploy:prepend:mx8() {
+do_deploy:prepend:mx8-nxp-bsp() {
     install -d ${DEPLOYDIR}/${PN}
     install -m 0644 ${DEPLOY_DIR_IMAGE}/imx-boot ${DEPLOYDIR}/${PN}/imx-boot-mfgtool
     install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot.itb ${DEPLOYDIR}/${PN}/u-boot-mfgtool.itb
@@ -54,13 +54,13 @@ do_deploy:prepend:imx7ulpea-ucom() {
     install -m 0644 ${DEPLOY_DIR_IMAGE}/fitImage-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE} ${DEPLOYDIR}/${PN}/fitImage-${MACHINE}-mfgtool
 }
 
-do_deploy:prepend:mx6ul() {
+do_deploy:prepend:mx6ul-nxp-bsp() {
     install -d ${DEPLOYDIR}/${PN}
     install -m 0644 ${DEPLOY_DIR_IMAGE}/SPL ${DEPLOYDIR}/${PN}/SPL-mfgtool
     install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot.itb ${DEPLOYDIR}/${PN}/u-boot-mfgtool.itb
 }
 
-do_deploy:prepend:mx6ull() {
+do_deploy:prepend:mx6ull-nxp-bsp() {
     install -d ${DEPLOYDIR}/${PN}
     install -m 0644 ${DEPLOY_DIR_IMAGE}/SPL ${DEPLOYDIR}/${PN}/SPL-mfgtool
     install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot.itb ${DEPLOYDIR}/${PN}/u-boot-mfgtool.itb