From 5ec8c6e06b6d68cc0cb2af99d826f98a82c5a55f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 6 Dec 2020 11:16:24 -0600 Subject: imx8qm-mek: Rename, update to B0, add PCI, OP-TEE, Broadcom WiFi, and device trees Rename to match device tree name and improve readability. Update to B0, which requires boot seek of 32. Fix missing pci support. Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc. Enable Broadcom 4356, 4359, and 43455 WiFi modules. Add device trees for PCIE EP, lvds, Sound Open Firmware, and USD WiFi. Signed-off-by: Tom Hochstein --- conf/machine/imx8qm-mek.conf | 85 ++++++++++++++++++++++++++++++++++++++++++++ conf/machine/imx8qmmek.conf | 67 ---------------------------------- 2 files changed, 85 insertions(+), 67 deletions(-) create mode 100644 conf/machine/imx8qm-mek.conf delete mode 100644 conf/machine/imx8qmmek.conf (limited to 'conf/machine') diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf new file mode 100644 index 00000000..c7b09d6b --- /dev/null +++ b/conf/machine/imx8qm-mek.conf @@ -0,0 +1,85 @@ +#@TYPE: Machine +#@NAME: i.MX 8QM MEK +#@DESCRIPTION: i.MX 8QuadMax Multisensory Enablement Kit board, rev B0 +#@MAINTAINER: Lauren Post + +MACHINEOVERRIDES =. "mx8:mx8qm:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa72-cortexa53.inc + +IMX_DEFAULT_BSP = "nxp" + +MACHINE_FEATURES += "pci optee bcm43455 bcm4356" +MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" + +# Don't include kernels in standard images +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +LOADADDR = "" + +# We have to disable SERIAL_CONSOLE due to auto-serial-console +SERIAL_CONSOLES = "115200;ttyAMA0" + +# we do not want to have getty running on tty1 as we run +# auto-serial-console there +USE_VT = "0" + +KERNEL_DEVICETREE = " \ + freescale/imx8qm-mek.dtb \ + freescale/imx8qm-mek-ca53.dtb \ + freescale/imx8qm-mek-ca72.dtb \ + freescale/imx8qm-mek-dom0.dtb \ + freescale/imx8qm-mek-domu.dtb \ + freescale/imx8qm-mek-dsi-rm67191.dtb \ + freescale/imx8qm-mek-dsp.dtb \ + freescale/imx8qm-mek-enet2-tja1100.dtb \ + freescale/imx8qm-mek-hdmi.dtb \ + freescale/imx8qm-mek-inmate.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ + freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ + freescale/imx8qm-mek-ov5640.dtb \ + freescale/imx8qm-mek-pcie-ep.dtb \ + freescale/imx8qm-mek-root.dtb \ + freescale/imx8qm-mek-rpmsg.dtb \ + freescale/imx8qm-mek-sof-cs42888.dtb \ + freescale/imx8qm-mek-sof-wm8960.dtb \ + freescale/imx8qm-mek-usd-wifi.dtb \ + freescale/imx8qm-mek-usdhc3-m2.dtb \ +" + +UBOOT_MAKE_TARGET = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '', \ + 'u-boot.bin', d)}" +SPL_BINARY_imx8qmmek = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \ + '', d)}" +UBOOT_SUFFIX = "bin" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "imx8qm_mek_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "imx8qm_mek_fspi_defconfig" +UBOOT_CONFIG[mfgtool] = "imx8qm_mek_defconfig" + +IMX_BOOT_SEEK = "32" + +IMAGE_BOOT_FILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin" + +# Set ATF platform name +ATF_PLATFORM = "imx8qm" + +IMXBOOT_TARGETS_SD = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ + 'flash flash_ca72', d)}" +IMXBOOT_TARGETS_FSPI = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl_flexspi', \ + 'flash_flexspi', d)}" +IMXBOOT_TARGETS = \ + "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ + '${IMXBOOT_TARGETS_FSPI}', d)}" +IMX_BOOT_SOC_TARGET = "iMX8QM" + +BOARD_TYPE = "mek" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf deleted file mode 100644 index 41a6bbe0..00000000 --- a/conf/machine/imx8qmmek.conf +++ /dev/null @@ -1,67 +0,0 @@ -#@TYPE: Machine -#@NAME: i.MX 8QM MEK -#@DESCRIPTION: i.MX 8QuadMax MEK board -#@MAINTAINER: Alexandru Palalau - -MACHINEOVERRIDES =. "mx8:mx8qm:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa72-cortexa53.inc - -IMX_DEFAULT_BSP = "nxp" - -MACHINE_FEATURES_append = " qca6174" - -# Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -LOADADDR = "" - -# We have to disable SERIAL_CONSOLE due to auto-serial-console -SERIAL_CONSOLES = "115200;ttyAMA0" - -# we do not want to have getty running on tty1 as we run -# auto-serial-console there -USE_VT = "0" - -KERNEL_DEVICETREE = " \ - freescale/imx8qm-mek-ca53.dtb \ - freescale/imx8qm-mek-ca72.dtb \ - freescale/imx8qm-mek-dom0.dtb \ - freescale/imx8qm-mek-domu.dtb \ - freescale/imx8qm-mek-dsi-rm67191.dtb \ - freescale/imx8qm-mek-dsp.dtb \ - freescale/imx8qm-mek.dtb \ - freescale/imx8qm-mek-enet2-tja1100.dtb \ - freescale/imx8qm-mek-hdmi.dtb \ - freescale/imx8qm-mek-inmate.dtb \ - freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ - freescale/imx8qm-mek-ov5640.dtb \ - freescale/imx8qm-mek-root.dtb \ - freescale/imx8qm-mek-rpmsg.dtb \ -" - -UBOOT_MAKE_TARGET = "u-boot.bin" -UBOOT_SUFFIX = "bin" -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8qm_mek_defconfig,sdcard" -UBOOT_CONFIG[fspi] = "imx8qm_mek_fspi_defconfig" -UBOOT_CONFIG[mfgtool] = "imx8qm_mek_defconfig" - -IMX_BOOT_SEEK = "33" - -WKS_FILE_DEPENDS_append = " firmware-imx-8" -IMAGE_BOOT_FILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin" - -# Set ATF platform name -ATF_PLATFORM = "imx8qm" - -IMXBOOT_TARGETS = \ - "${@bb.utils.contains('UBOOT_CONFIG', 'sd', 'flash', \ - 'flash_flexspi', d)}" -IMX_BOOT_SOC_TARGET = "iMX8QM" - -BOARD_TYPE = "mek" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" -- cgit v1.2.3-54-g00ecf