Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / Makefile

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 28f16b6..3d1ea0b 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -418,6 +418,7 @@ dtb-$(CONFIG_SOC_IMX53) += \
        imx53-usbarmory.dtb \
        imx53-voipac-bsb.dtb
 dtb-$(CONFIG_SOC_IMX6Q) += \
+       imx6dl-alti6p.dtb \
        imx6dl-apf6dev.dtb \
        imx6dl-aristainetos_4.dtb \
        imx6dl-aristainetos_7.dtb \
@@ -454,6 +455,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-icore.dtb \
        imx6dl-icore-mipi.dtb \
        imx6dl-icore-rqs.dtb \
+       imx6dl-lanmcu.dtb \
        imx6dl-mamoj.dtb \
        imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
@@ -585,6 +587,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6qp-nitrogen6_max.dtb \
        imx6qp-nitrogen6_som2.dtb \
        imx6qp-phytec-mira-rdk-nand.dtb \
+       imx6qp-prtwd3.dtb \
        imx6qp-sabreauto.dtb \
        imx6qp-sabresd.dtb \
        imx6qp-tx6qp-8037.dtb \
@@ -626,6 +629,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-pico-dwarf.dtb \
        imx6ul-pico-hobbit.dtb \
        imx6ul-pico-pi.dtb \
+       imx6ul-phytec-segin-ff-rdk-emmc.dtb \
        imx6ul-phytec-segin-ff-rdk-nand.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \
@@ -645,6 +649,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-colibri-emmc-aster.dtb \
        imx7d-colibri-emmc-eval-v3.dtb \
        imx7d-colibri-eval-v3.dtb \
+       imx7d-flex-concentrator.dtb \
+       imx7d-flex-concentrator-mfg.dtb \
        imx7d-mba7.dtb \
        imx7d-meerkat96.dtb \
        imx7d-nitrogen7.dtb \
@@ -1311,6 +1317,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
        zynq-zc770-xm013.dtb \
        zynq-zed.dtb \
        zynq-zturn.dtb \
+       zynq-zturn-v5.dtb \
        zynq-zybo.dtb \
        zynq-zybo-z7.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \
@@ -1388,6 +1395,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
 dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb
 dtb-$(CONFIG_ARCH_MSTARV7) += \
        mstar-infinity-msc313-breadbee_crust.dtb \
+       mstar-infinity2m-ssd202d-ssd201htv2.dtb \
        mstar-infinity3-msc313e-breadbee.dtb \
        mstar-mercury5-ssc8336n-midrived08.dtb
 dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
@@ -1397,7 +1405,9 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-bmc-amd-ethanolx.dtb \
        aspeed-bmc-arm-centriq2400-rep.dtb \
        aspeed-bmc-arm-stardragon4800-rep2.dtb \
+       aspeed-bmc-bytedance-g220a.dtb \
        aspeed-bmc-facebook-cmm.dtb \
+       aspeed-bmc-facebook-galaxy100.dtb \
        aspeed-bmc-facebook-minipack.dtb \
        aspeed-bmc-facebook-tiogapass.dtb \
        aspeed-bmc-facebook-wedge40.dtb \
@@ -1406,6 +1416,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-bmc-facebook-yamp.dtb \
        aspeed-bmc-facebook-yosemitev2.dtb \
        aspeed-bmc-ibm-rainier.dtb \
+       aspeed-bmc-ibm-rainier-4u.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
        aspeed-bmc-inspur-fp5280g2.dtb \
        aspeed-bmc-lenovo-hr630.dtb \