From 9cd6ac0a87c2ee804b74d2ac0fdaedc14dc9ca7c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 6 Dec 2020 09:53:10 -0600 Subject: 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 --- conf/machine/imx8mq-evk.conf | 78 ++++++++++++++++++++++++++++++++++++++++++++ conf/machine/imx8mqevk.conf | 71 ---------------------------------------- 2 files changed, 78 insertions(+), 71 deletions(-) create mode 100644 conf/machine/imx8mq-evk.conf delete mode 100644 conf/machine/imx8mqevk.conf diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf new file mode 100644 index 00000000..0fe0f8c7 --- /dev/null +++ b/conf/machine/imx8mq-evk.conf @@ -0,0 +1,78 @@ +#@TYPE: Machine +#@NAME: NXP i.MX 8M Quad EVK +#@SOC: i.MX8MQ +#@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit +#@MAINTAINER: Jun Zhu + +MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" + +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-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" + +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 \ +" + +# Set u-boot DTB +UBOOT_DTB_NAME = "imx8mq-evk.dtb" + +# Set ATF platform name +ATF_PLATFORM = "imx8mq" + +# Set imx-mkimage boot target +IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" +IMX_BOOT_SOC_TARGET = "iMX8M" + +LOADADDR = "" +UBOOT_SUFFIX = "bin" +UBOOT_MAKE_TARGET = "" +IMX_BOOT_SEEK = "33" + +OPTEE_BIN_EXT = "8mq" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" + +# Use gstreamer 1.16 from meta-freescale +PREFERRED_VERSION_gstreamer1.0 ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-libav ?= "1.16.0" diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf deleted file mode 100644 index 327ee0ac..00000000 --- a/conf/machine/imx8mqevk.conf +++ /dev/null @@ -1,71 +0,0 @@ -#@TYPE: Machine -#@NAME: NXP i.MX8MQ Evaluation Kit -#@SOC: i.MX8MQ -#@DESCRIPTION: Machine configuration for NXP i.MX8MQ EVK -#@MAINTAINER: Alexandru Palalau - -MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES += "pci wifi bluetooth optee qca6174" - -MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" - -KERNEL_DEVICETREE = " \ - 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-pcie1-m2.dtb \ - freescale/imx8mq-evk-pdm.dtb \ - freescale/imx8mq-evk-root.dtb \ - freescale/imx8mq-evk-rpmsg.dtb \ -" - -UBOOT_CONFIG ??= "sd" -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" - -# Set u-boot DTB -UBOOT_DTB_NAME = "imx8mq-evk.dtb" - -# Set ATF platform name -ATF_PLATFORM = "imx8mq" - -# Set imx-mkimage boot target -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 = "" -IMX_BOOT_SEEK = "33" - -OPTEE_BIN_EXT = "8mq" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" - -# Use gstreamer 1.16 from meta-freescale -PREFERRED_VERSION_gstreamer1.0 ?= "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-libav ?= "1.16.0" -- cgit v1.2.3-54-g00ecf