1 files changed, 24 insertions, 18 deletions

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index b2a398a9..82a9b3db 100644
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -9,13 +9,13 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa53.inc
 
-MACHINE_FEATURES += "pci wifi bluetooth optee"
+MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356"
 
-# NXP BSP can consume QCA9377 driver and firmware
+# NXP BSP can consume BCM4359 and 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_append_use-nxp-bsp = " qca9377"
+MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359 qca9377"
 
 # Mainline kernel contains only one DTB file for
 # imx8mmevk machine
@@ -24,25 +24,31 @@ 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_append_use-nxp-bsp = " \
-       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 \
+        freescale/imx8mm-ddr4-evk.dtb \
+        freescale/imx8mm-ddr4-evk-pcie-ep.dtb \
+        freescale/imx8mm-ddr4-evk-revb.dtb \
+        freescale/imx8mm-ddr4-evk-revb-rm67191.dtb \
+        freescale/imx8mm-ddr4-evk-rm67191.dtb \
+        freescale/imx8mm-evk-8mic-revE.dtb \
+        freescale/imx8mm-evk-8mic-swpdm.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-pcie-ep.dtb \
+        freescale/imx8mm-evk-revb.dtb \
+        freescale/imx8mm-evk-rm67191.dtb \
+        freescale/imx8mm-evk-root.dtb \
+        freescale/imx8mm-evk-rpmsg.dtb \
+        freescale/imx8mm-evk-usd-wifi.dtb \
 "
 
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "imx8mm_evk_config,sdcard"
-UBOOT_CONFIG[fspi] = "imx8mm_evk_fspi_defconfig"
-UBOOT_CONFIG[mfgtool] = "imx8mm_evk_config"
+UBOOT_CONFIG[sd]       = "imx8mm_evk_config,sdcard"
+UBOOT_CONFIG[fspi]     = "imx8mm_evk_fspi_defconfig"
+UBOOT_CONFIG[mfgtool]  = "imx8mm_evk_config"
+
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 # Set DDR FIRMWARE