1 files changed, 34 insertions, 19 deletions

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index db722c72..231d7ff7 100644
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -9,26 +9,36 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
 
-IMX_DEFAULT_BSP = "nxp"
-
-MACHINE_FEATURES += " pci wifi bluetooth optee qca9377"
-
-KERNEL_DEVICETREE = " \
-        freescale/imx8mm-ddr4-evk.dtb \
-        freescale/imx8mm-ddr4-evk-revb.dtb \
-        freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \
-        freescale/imx8mm-ddr4-evk-rm67191.dtb \
-        freescale/imx8mm-evk-ak4497.dtb \
-        freescale/imx8mm-evk-ak5558.dtb \
-        freescale/imx8mm-evk-audio-tdm.dtb \
-        freescale/imx8mm-evk.dtb \
-        freescale/imx8mm-evk-inmate.dtb \
-        freescale/imx8mm-evk-revb.dtb \
-        freescale/imx8mm-evk-rm67191.dtb \
-        freescale/imx8mm-evk-root.dtb \
-        freescale/imx8mm-evk-rpmsg.dtb \
+MACHINE_FEATURES += "pci wifi bluetooth optee"
+
+# NXP BSP can consume QCA9377 driver and firmware
+# Since the firmware is not available publicly, and rather distributed
+# under "Proprietary" license - we opt-out from using it in all BSPs
+# and pin it to NXP BSP only
+MACHINE_FEATURES_use-nxp-bsp_append = " qca9377"
+
+# Mainline kernel contains only one DTB file for
+# imx8mmevk machine
+KERNEL_DEVICETREE = "freescale/imx8mm-evk.dtb"
+
+# 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/imx8mm-ddr4-evk.dtb \
+       freescale/imx8mm-ddr4-evk-revb.dtb \
+       freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \
+       freescale/imx8mm-ddr4-evk-rm67191.dtb \
+       freescale/imx8mm-evk-ak4497.dtb \
+       freescale/imx8mm-evk-ak5558.dtb \
+       freescale/imx8mm-evk-audio-tdm.dtb \
+       freescale/imx8mm-evk-inmate.dtb \
+       freescale/imx8mm-evk-revb.dtb \
+       freescale/imx8mm-evk-rm67191.dtb \
+       freescale/imx8mm-evk-root.dtb \
+       freescale/imx8mm-evk-rpmsg.dtb \
 "
 
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard"
 UBOOT_CONFIG[fspi] = "imx8mm_evk_fspi_defconfig"
@@ -36,7 +46,12 @@ UBOOT_CONFIG[mfgtool] = "imx8mm_evk_config"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 # Set DDR FIRMWARE
-DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
+DDR_FIRMWARE_NAME = " \
+        lpddr4_pmu_train_1d_imem.bin \
+        lpddr4_pmu_train_1d_dmem.bin \
+        lpddr4_pmu_train_2d_imem.bin \
+        lpddr4_pmu_train_2d_dmem.bin \
+"
 
 # Set u-boot DTB
 UBOOT_DTB_NAME = "imx8mm-evk.dtb"