diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-09 13:43:18 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-09 13:43:18 +0100 |
commit | 9a14a1f6284c0a5d3bbbb4ccfea8b6959ca63d83 (patch) | |
tree | 5c8e9c1cc4365cee43e407eb72871d5ba4b08357 /arch/arm64/boot/dts/freescale/Makefile | |
parent | dc6fa31dd7b294f586a07d5929ae3765ddbf86f3 (diff) | |
parent | cd7c926fa65431a20a044f55dbd7609beaffbe46 (diff) |
Merge remote-tracking branch 'fslc/4.14-2.3.x-imx' into toradex_4.14-2.3.x-imx
Conflicts:
arch/arm64/boot/dts/freescale/Makefile
arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi
Diffstat (limited to 'arch/arm64/boot/dts/freescale/Makefile')
-rw-r--r-- | arch/arm64/boot/dts/freescale/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index e43e50628d73..67ce34437abd 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -94,6 +94,16 @@ dtb-$(CONFIG_ARCH_FSL_IMX8QXP) += fsl-imx8qxp-lpddr4-arm2.dtb \ fsl-imx8qxp-ddr3l-val.dtb \ fsl-imx8dx-17x17-val.dtb \ fsl-imx8dx-lpddr4-arm2.dtb \ + fsl-imx8dx-mek.dtb \ + fsl-imx8dx-mek-rpmsg.dtb \ + fsl-imx8dx-mek-dsp.dtb \ + fsl-imx8dx-mek-enet2-tja1100.dtb \ + fsl-imx8dx-mek-ov5640.dtb \ + fsl-imx8dx-mek-dsi-rm67191.dtb \ + fsl-imx8dx-mek-it6263-lvds0-dual-channel.dtb \ + fsl-imx8dx-mek-it6263-lvds1-dual-channel.dtb \ + fsl-imx8dx-mek-jdi-wuxga-lvds0-panel.dtb \ + fsl-imx8dx-mek-jdi-wuxga-lvds1-panel.dtb \ fsl-imx8dxp-lpddr4-arm2.dtb \ fsl-imx8qxp-apalis-eval.dtb \ fsl-imx8qxp-colibri-aster.dtb \ |