Merge remote-tracking branch 'sunxi/sunxi/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / Makefile

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5b54f992ee28da8f474b650d767e4f145a8bf6bd..2c8d55bb67e64f99831ebade74fe90b40adc452a 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -69,7 +69,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
        bcm2835-rpi-b-rev2.dtb \
        bcm2835-rpi-b-plus.dtb \
        bcm2835-rpi-a-plus.dtb \
-       bcm2836-rpi-2-b.dtb
+       bcm2836-rpi-2-b.dtb \
+       bcm2835-rpi-zero.dtb
 dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-asus-rt-ac56u.dtb \
        bcm4708-asus-rt-ac68u.dtb \
@@ -315,6 +316,7 @@ dtb-$(CONFIG_SOC_IMX53) += \
        imx53-smd.dtb \
        imx53-tx53-x03x.dtb \
        imx53-tx53-x13x.dtb \
+       imx53-usbarmory.dtb \
        imx53-voipac-bsb.dtb
 dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-apf6dev.dtb \
@@ -330,6 +332,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-gw54xx.dtb \
        imx6dl-gw551x.dtb \
        imx6dl-gw552x.dtb \
+       imx6dl-gw553x.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
@@ -339,6 +342,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-sabreauto.dtb \
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
+       imx6dl-ts4900.dtb \
        imx6dl-tx6dl-comtft.dtb \
        imx6dl-tx6s-8034.dtb \
        imx6dl-tx6s-8035.dtb \
@@ -368,6 +372,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6q-gw54xx.dtb \
        imx6q-gw551x.dtb \
        imx6q-gw552x.dtb \
+       imx6q-gw553x.dtb \
        imx6q-h100.dtb \
        imx6q-hummingboard.dtb \
        imx6q-icore-rqs.dtb \
@@ -382,6 +387,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6q-sabresd.dtb \
        imx6q-sbc6x.dtb \
        imx6q-tbs2910.dtb \
+       imx6q-ts4900.dtb \
        imx6q-tx6q-1010.dtb \
        imx6q-tx6q-1010-comtft.dtb \
        imx6q-tx6q-1020.dtb \
@@ -407,6 +413,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
        imx6sx-sdb.dtb
 dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-14x14-evk.dtb \
+       imx6ul-geam-kit.dtb \
        imx6ul-pico-hobbit.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \
@@ -417,7 +424,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-nitrogen7.dtb \
        imx7d-sbc-imx7.dtb \
        imx7d-sdb.dtb \
-       imx7s-colibri-eval-v3.dtb
+       imx7s-colibri-eval-v3.dtb \
+       imx7s-warp.dtb
 dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-qds.dtb \
        ls1021a-twr.dtb
@@ -603,6 +611,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
        qcom-ipq8064-ap148.dtb \
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
+       qcom-msm8974-lge-nexus5-hammerhead.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
 dtb-$(CONFIG_ARCH_REALVIEW) += \
        arm-realview-pb1176.dtb \
@@ -624,8 +633,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3229-evb.dtb \
        rk3288-evb-act8846.dtb \
        rk3288-evb-rk808.dtb \
+       rk3288-fennec.dtb \
        rk3288-firefly-beta.dtb \
        rk3288-firefly.dtb \
+       rk3288-firefly-reload.dtb \
        rk3288-miqi.dtb \
        rk3288-popmetal.dtb \
        rk3288-r89.dtb \
@@ -651,6 +662,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
        emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
+       r7s72100-rskrza1.dtb \
        r8a73a4-ape6evm.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
@@ -659,6 +671,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
        r8a7791-koelsch.dtb \
        r8a7791-porter.dtb \
        r8a7792-blanche.dtb \
+       r8a7792-wheat.dtb \
        r8a7793-gose.dtb \
        r8a7794-alt.dtb \
        r8a7794-silk.dtb \