1 files changed, 8 insertions, 4 deletions

diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mpevk.conf
index d1376649..f76240b6 100644
--- a/conf/machine/imx8mpevk.conf
+++ b/conf/machine/imx8mpevk.conf
@@ -9,14 +9,18 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
 
-IMX_DEFAULT_BSP = "nxp"
+MACHINE_FEATURES += "pci wifi bluetooth optee"
+MACHINE_FEATURES_use-nxp-bsp_append = " mrvl8997"
 
-MACHINE_FEATURES += " pci wifi bluetooth optee mrvl8997"
+# Mainline kernel contains only one DTB file for
+# imx8mpevk machine
+KERNEL_DEVICETREE = "freescale/imx8mp-evk.dtb"
 
-KERNEL_DEVICETREE = " \
+# NXP kernel has additional DTB files for various board configuration and
+# derivates. Include them here for NXP BSP only
+KERNEL_DEVICETREE_use-nxp-bsp_append = " \
         freescale/imx8mp-ab2.dtb \
         freescale/imx8mp-evk-basler.dtb \
-        freescale/imx8mp-evk.dtb \
         freescale/imx8mp-evk-dsp.dtb \
         freescale/imx8mp-evk-flexcan2.dtb \
         freescale/imx8mp-evk-inmate.dtb \