Merge tag 'rpi-next-2019.07' of https://github.com/mbgg/u-boot

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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 1d6367a3bf31a183a461239c5adad490794aea33..20dbc2ff84808056d36eb968ebf177b993f17cd0 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -537,15 +537,14 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \
        vf610-bk4r1.dtb
 
 dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \
-       imx53-kp.dtb
+       imx53-kp.dtb \
+       imx53-m53menlo.dtb
 
 dtb-$(CONFIG_MX6Q) += \
        imx6-apalis.dtb \
        imx6q-display5.dtb \
        imx6q-logicpd.dtb \
-       imx6q-novena.dtb
-
-dtb-$(CONFIG_TARGET_TBS2910) += \
+       imx6q-novena.dtb \
        imx6q-tbs2910.dtb
 
 dtb-$(CONFIG_MX6QDL) += \
@@ -553,19 +552,19 @@ dtb-$(CONFIG_MX6QDL) += \
        imx6dl-icore-mipi.dtb \
        imx6dl-icore-rqs.dtb \
        imx6dl-mamoj.dtb \
+       imx6dl-sabreauto.dtb \
+       imx6dl-sabresd.dtb \
+       imx6dl-wandboard-revb1.dtb \
        imx6q-cm-fx6.dtb \
        imx6q-icore.dtb \
        imx6q-icore-mipi.dtb \
        imx6q-icore-rqs.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabresd.dtb \
-       imx6dl-sabreauto.dtb \
-       imx6dl-sabresd.dtb \
+       imx6q-wandboard-revb1.dtb \
        imx6qp-sabreauto.dtb \
-       imx6qp-sabresd.dtb
-
-dtb-$(CONFIG_TARGET_WANDBOARD) += \
-       imx6dl-wandboard-revb1.dtb
+       imx6qp-sabresd.dtb \
+       imx6qp-wandboard-revd1.dtb
 
 dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb
 
@@ -738,14 +737,19 @@ dtb-$(CONFIG_TARGET_VINCO) += \
        at91-vinco.dtb
 
 dtb-$(CONFIG_ARCH_BCM283X) += \
-       bcm2835-rpi-a-plus.dtb \
        bcm2835-rpi-a.dtb \
+       bcm2835-rpi-a-plus.dtb \
+       bcm2835-rpi-b.dtb \
        bcm2835-rpi-b-plus.dtb \
        bcm2835-rpi-b-rev2.dtb \
-       bcm2835-rpi-b.dtb \
-       bcm2835-rpi-zero-w.dtb \
+       bcm2835-rpi-cm1-io1.dtb \
+       bcm2835-rpi-zero.dtb \
+       bcm2835-rpi-zero-w.dtb\
        bcm2836-rpi-2-b.dtb \
-       bcm2837-rpi-3-b.dtb
+       bcm2837-rpi-3-a-plus.dtb \
+       bcm2837-rpi-3-b.dtb \
+       bcm2837-rpi-3-b-plus.dtb \
+       bcm2837-rpi-cm3-io3.dtb
 
 dtb-$(CONFIG_ARCH_BCM63158) += \
        bcm963158.dtb