Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / Makefile

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6ea09ffd3bf84f9cbab8919fe48b502e71408cc8..73d47f5ac46467f504ee1234d787c3c4e98e6704 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -552,33 +552,44 @@ dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \
        imx53-kp.dtb \
        imx53-m53menlo.dtb
 
-dtb-$(CONFIG_MX6Q) += \
-       imx6-apalis.dtb \
-       imx6q-display5.dtb \
-       imx6q-logicpd.dtb \
-       imx6q-novena.dtb \
-       imx6q-tbs2910.dtb
-
-dtb-$(CONFIG_MX6QDL) += \
+ifneq ($(CONFIG_MX6DL)$(CONFIG_MX6QDL)$(CONFIG_MX6S),)
+dtb-y += \
        imx6dl-dhcom-pdk2.dtb \
        imx6dl-icore.dtb \
        imx6dl-icore-mipi.dtb \
        imx6dl-icore-rqs.dtb \
        imx6dl-mamoj.dtb \
+       imx6dl-nitrogen6x.dtb \
+       imx6dl-pico.dtb \
        imx6dl-sabreauto.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-wandboard-revb1.dtb \
+
+endif
+
+ifneq ($(CONFIG_MX6Q)$(CONFIG_MX6QDL),)
+dtb-y += \
+       imx6-apalis.dtb \
        imx6q-cm-fx6.dtb \
        imx6q-dhcom-pdk2.dtb \
+       imx6q-display5.dtb \
        imx6q-icore.dtb \
        imx6q-icore-mipi.dtb \
        imx6q-icore-rqs.dtb \
+       imx6q-logicpd.dtb \
+       imx6q-nitrogen6x.dtb \
+       imx6q-novena.dtb \
+       imx6q-pico.dtb \
        imx6q-sabreauto.dtb \
+       imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
+       imx6q-tbs2910.dtb \
        imx6q-wandboard-revb1.dtb \
        imx6qp-sabreauto.dtb \
        imx6qp-sabresd.dtb \
-       imx6qp-wandboard-revd1.dtb
+       imx6qp-wandboard-revd1.dtb \
+
+endif
 
 dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb
 
@@ -606,7 +617,8 @@ dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri.dtb \
        imx6ull-phycore-segin.dtb \
-       imx6ull-dart-6ul.dtb
+       imx6ull-dart-6ul.dtb \
+       imx6ulz-14x14-evk.dtb
 
 dtb-$(CONFIG_ARCH_MX6) += \
        imx6-apalis.dtb \
@@ -629,7 +641,8 @@ dtb-$(CONFIG_ARCH_IMX8) += \
        fsl-imx8qxp-colibri.dtb \
        fsl-imx8qxp-mek.dtb
 
-dtb-$(CONFIG_ARCH_IMX8M) += fsl-imx8mq-evk.dtb
+dtb-$(CONFIG_ARCH_IMX8M) += fsl-imx8mq-evk.dtb \
+       imx8mm-evk.dtb
 
 dtb-$(CONFIG_RCAR_GEN2) += \
        r8a7790-lager-u-boot.dtb \