imx8mq-evk: Rename, drop QCA, add Broadcom WiFi and several device trees

Rename to match device tree name.

Drop Qualcomm 6174, which is no longer supported.

Enable Broadcom 4356, 4359, and 43455 WiFi modules.

Add device trees for PCIE EP and USD WiFi.

Drop redundant SERIAL_CONSOLES assignment.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

1 files changed, 18 insertions, 11 deletions

diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mq-evk.conf
index 327ee0ac..0fe0f8c7 100644
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -1,8 +1,8 @@
 #@TYPE: Machine
-#@NAME: NXP i.MX8MQ Evaluation Kit
+#@NAME: NXP i.MX 8M Quad EVK
 #@SOC: i.MX8MQ
-#@DESCRIPTION: Machine configuration for NXP i.MX8MQ EVK
-#@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
+#@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit
+#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
 MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
 
@@ -11,34 +11,44 @@ require conf/machine/include/tune-cortexa53.inc
 
 IMX_DEFAULT_BSP = "nxp"
 
-MACHINE_FEATURES += "pci wifi bluetooth optee qca6174"
+MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356"
+MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359"
 
 MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
 
 KERNEL_DEVICETREE = " \
+        freescale/imx8mq-evk.dtb \
         freescale/imx8mq-evk-ak4497.dtb \
         freescale/imx8mq-evk-audio-tdm.dtb \
         freescale/imx8mq-evk-dcss-adv7535.dtb \
         freescale/imx8mq-evk-dcss-rm67191.dtb \
         freescale/imx8mq-evk-dp.dtb \
-        freescale/imx8mq-evk.dtb \
         freescale/imx8mq-evk-dual-display.dtb \
         freescale/imx8mq-evk-inmate.dtb \
         freescale/imx8mq-evk-lcdif-adv7535.dtb \
         freescale/imx8mq-evk-lcdif-rm67191.dtb \
+        freescale/imx8mq-evk-pcie-ep.dtb \
         freescale/imx8mq-evk-pcie1-m2.dtb \
         freescale/imx8mq-evk-pdm.dtb \
         freescale/imx8mq-evk-root.dtb \
         freescale/imx8mq-evk-rpmsg.dtb \
+        freescale/imx8mq-evk-usd-wifi.dtb \
+        freescale/imx8mq-evk-usdhc2-m2.dtb \
 "
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard"
-UBOOT_CONFIG[mfgtool] = "imx8mq_evk_config"
+UBOOT_CONFIG[sd]       = "imx8mq_evk_config,sdcard"
+UBOOT_CONFIG[mfgtool]  = "imx8mq_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 = "imx8mq-evk.dtb"
@@ -50,9 +60,6 @@ ATF_PLATFORM = "imx8mq"
 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
 IMX_BOOT_SOC_TARGET = "iMX8M"
 
-# Set Serial console
-SERIAL_CONSOLES = "115200;ttymxc0"
-
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
 UBOOT_MAKE_TARGET = ""