From 96e3bc62b12643bc1d21f87f5a46bbce0aee0600 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 16 Dec 2020 14:07:19 -0600 Subject: [PATCH] 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 +++++++++ .../imx8x-mek.inc} | 57 +++++++------------ 2 files changed, 47 insertions(+), 36 deletions(-) create mode 100644 conf/machine/imx8qxp-mek.conf rename conf/machine/{imx8qxpmek.conf => include/imx8x-mek.inc} (51%) diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf new file mode 100644 index 00000000..fe0f6727 --- /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/include/imx8x-mek.inc similarity index 51% rename from conf/machine/imx8qxpmek.conf rename to conf/machine/include/imx8x-mek.inc index fa362180..490e00db 100644 --- a/conf/machine/imx8qxpmek.conf +++ b/conf/machine/include/imx8x-mek.inc @@ -1,9 +1,4 @@ -#@TYPE: Machine -#@NAME: i.MX 8QXP MEK -#@DESCRIPTION: i.MX 8QXP Multisensory Enablement Kit (MEK) board -#@MAINTAINER: Lauren Post - -MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" +MACHINEOVERRIDES =. "mx8:mx8x:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa35.inc @@ -26,34 +21,24 @@ SERIAL_CONSOLES = "115200;ttyAMA0" 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 \ + 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 = \ @@ -64,8 +49,8 @@ SPL_BINARY = \ '', d)}" UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "imx8qxp_mek_defconfig,sdcard" -UBOOT_CONFIG[fspi] = "imx8qxp_mek_fspi_defconfig" +UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" +UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig" IMX_BOOT_SEEK = "32" -- 2.40.1