From 96e3bc62b12643bc1d21f87f5a46bbce0aee0600 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 16 Dec 2020 14:07:19 -0600 Subject: imx8qxp-mek.conf: Rework 8QXP MEK to capture commonality The 8QuadXPlus and 8DualXPlus are identical except for core number, and the Multisensory Environment Kit board for each is the same. Rework the configuration to better capture the commonality. Also, rename the machine to match the devicetree name, which also improves readability. Signed-off-by: Tom Hochstein --- conf/machine/imx8qxp-mek.conf | 26 +++++++++++ conf/machine/imx8qxpmek.conf | 89 -------------------------------------- conf/machine/include/imx8x-mek.inc | 74 +++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 89 deletions(-) create mode 100644 conf/machine/imx8qxp-mek.conf delete mode 100644 conf/machine/imx8qxpmek.conf create mode 100644 conf/machine/include/imx8x-mek.inc (limited to 'conf') diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf new file mode 100644 index 000000000..fe0f67276 --- /dev/null +++ b/conf/machine/imx8qxp-mek.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@NAME: i.MX 8QXP MEK +#@DESCRIPTION: i.MX 8QuadXPlus Multisensory Enablement Kit board +#@MAINTAINER: Lauren Post + +MACHINEOVERRIDES =. "mx8qxp:" + +require include/imx8x-mek.inc + +KERNEL_DEVICETREE_BASENAME = "${MACHINE}" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \ +" + +UBOOT_CONFIG_BASENAME = "imx8qxp_mek" diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf deleted file mode 100644 index fa362180d..000000000 --- a/conf/machine/imx8qxpmek.conf +++ /dev/null @@ -1,89 +0,0 @@ -#@TYPE: Machine -#@NAME: i.MX 8QXP MEK -#@DESCRIPTION: i.MX 8QXP Multisensory Enablement Kit (MEK) board -#@MAINTAINER: Lauren Post - -MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" - -require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa35.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/imx8qxp-mek.dtb \ - freescale/imx8qxp-mek-a0.dtb \ - freescale/imx8qxp-mek-dom0.dtb \ - freescale/imx8qxp-mek-dpu-lcdif.dtb \ - freescale/imx8qxp-mek-dpu-lcdif-rpmsg.dtb \ - freescale/imx8qxp-mek-dsi-rm67191.dtb \ - freescale/imx8qxp-mek-dsi-rm67191-rpmsg.dtb \ - freescale/imx8qxp-mek-dsp.dtb \ - freescale/imx8qxp-mek-enet2-tja1100.dtb \ - freescale/imx8qxp-mek-enet2.dtb \ - freescale/imx8qxp-mek-inmate.dtb \ - freescale/imx8qxp-mek-it6263-lvds0-dual-channel.dtb \ - freescale/imx8qxp-mek-it6263-lvds0-dual-channel-rpmsg.dtb \ - freescale/imx8qxp-mek-it6263-lvds1-dual-channel.dtb \ - freescale/imx8qxp-mek-it6263-lvds1-dual-channel-rpmsg.dtb \ - freescale/imx8qxp-mek-jdi-wuxga-lvds0-panel.dtb \ - freescale/imx8qxp-mek-jdi-wuxga-lvds0-panel-rpmsg.dtb \ - freescale/imx8qxp-mek-jdi-wuxga-lvds1-panel.dtb \ - freescale/imx8qxp-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ - freescale/imx8qxp-mek-lcdif.dtb \ - freescale/imx8qxp-mek-lcdif-rpmsg.dtb \ - freescale/imx8qxp-mek-ov5640.dtb \ - freescale/imx8qxp-mek-ov5640-rpmsg.dtb \ - freescale/imx8qxp-mek-pcie-ep.dtb \ - freescale/imx8qxp-mek-root.dtb \ - freescale/imx8qxp-mek-rpmsg.dtb \ - freescale/imx8qxp-mek-sof-cs42888.dtb \ - freescale/imx8qxp-mek-sof-wm8960.dtb \ -" - -UBOOT_MAKE_TARGET = \ - "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '', \ - 'u-boot.bin', d)}" -SPL_BINARY = \ - "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \ - '', d)}" - -UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8qxp_mek_defconfig,sdcard" -UBOOT_CONFIG[fspi] = "imx8qxp_mek_fspi_defconfig" - -IMX_BOOT_SEEK = "32" - -# Set ATF platform name -ATF_PLATFORM = "imx8qx" - -IMXBOOT_TARGETS_SD = \ - "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ - 'flash', 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 = "iMX8QX" - -BOARD_TYPE = "mek" - -# Add additional firmware -MACHINE_FIRMWARE_append = " linux-firmware-ath10k" diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc new file mode 100644 index 000000000..490e00dbf --- /dev/null +++ b/conf/machine/include/imx8x-mek.inc @@ -0,0 +1,74 @@ +MACHINEOVERRIDES =. "mx8:mx8x:" + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa35.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/${KERNEL_DEVICETREE_BASENAME}.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-dsp.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds1-dual-channel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds1-dual-channel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \ + freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ +" + +UBOOT_MAKE_TARGET = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '', \ + 'u-boot.bin', d)}" +SPL_BINARY = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \ + '', d)}" + +UBOOT_CONFIG ??= "sd" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" + +IMX_BOOT_SEEK = "32" + +# Set ATF platform name +ATF_PLATFORM = "imx8qx" + +IMXBOOT_TARGETS_SD = \ + "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ + 'flash', 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 = "iMX8QX" + +BOARD_TYPE = "mek" + +# Add additional firmware +MACHINE_FIRMWARE_append = " linux-firmware-ath10k" -- cgit v1.2.3-54-g00ecf