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 8e082f28403a8d9510719f6abc84abfef9ece75d..20dbc2ff84808056d36eb968ebf177b993f17cd0 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -65,16 +65,23 @@ dtb-$(CONFIG_KIRKWOOD) += \
 dtb-$(CONFIG_ARCH_OWL) += \
        bubblegum_96.dtb
 
-dtb-$(CONFIG_ARCH_ROCKCHIP) += \
-       rk3036-sdk.dtb \
-       rk3128-evb.dtb \
-       rk3188-radxarock.dtb \
-       rk3229-evb.dtb \
+dtb-$(CONFIG_ROCKCHIP_RK3036) += \
+       rk3036-sdk.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3128) += \
+       rk3128-evb.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3188) += \
+       rk3188-radxarock.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK322X) += \
+       rk3229-evb.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3288) += \
        rk3288-evb.dtb \
        rk3288-fennec.dtb \
        rk3288-firefly.dtb \
        rk3288-miqi.dtb \
-       rk3399-orangepi.dtb \
        rk3288-phycore-rdk.dtb \
        rk3288-popmetal.dtb \
        rk3288-rock2-square.dtb \
@@ -83,22 +90,38 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3288-veyron-mickey.dtb \
        rk3288-veyron-minnie.dtb \
        rk3288-veyron-speedy.dtb \
-       rk3288-vyasa.dtb \
+       rk3288-vyasa.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3328) += \
        rk3328-evb.dtb \
-       rk3399-ficus.dtb \
+       rk3328-rock64.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3368) += \
        rk3368-lion.dtb \
        rk3368-sheep.dtb \
        rk3368-geekbox.dtb \
        rk3368-px5-evb.dtb \
+
+dtb-$(CONFIG_ROCKCHIP_RK3399) += \
        rk3399-evb.dtb \
+       rk3399-ficus.dtb \
        rk3399-firefly.dtb \
        rk3399-gru-bob.dtb \
+       rk3399-nanopc-t4.dtb \
+       rk3399-nanopi-m4.dtb \
+       rk3399-nanopi-neo4.dtb \
+       rk3399-orangepi.dtb \
        rk3399-puma-ddr1333.dtb \
        rk3399-puma-ddr1600.dtb \
        rk3399-puma-ddr1866.dtb \
+       rk3399-rock-pi-4.dtb \
        rk3399-rock960.dtb \
+       rk3399-rockpro64.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RV1108) += \
        rv1108-elgin-r1.dtb \
        rv1108-evb.dtb
+
 dtb-$(CONFIG_ARCH_MESON) += \
        meson-gxbb-nanopi-k2.dtb \
        meson-gxbb-odroidc2.dtb \
@@ -162,7 +185,8 @@ dtb-$(CONFIG_ARCH_MVEBU) +=                 \
        armada-38x-controlcenterdc.dtb          \
        armada-385-atl-x530.dtb                 \
        armada-385-atl-x530DP.dtb               \
-       armada-xp-db-xc3-24g4xg.dtb
+       armada-xp-db-xc3-24g4xg.dtb             \
+       armada-xp-crs305-1g-4s.dtb
 
 dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
        uniphier-ld11-global.dtb \
@@ -276,6 +300,7 @@ dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) +=                          \
        socfpga_arria5_socdk.dtb                        \
        socfpga_arria10_socdk_sdmmc.dtb                 \
+       socfpga_cyclone5_mcvevk.dtb                     \
        socfpga_cyclone5_is1.dtb                        \
        socfpga_cyclone5_socdk.dtb                      \
        socfpga_cyclone5_dbm_soc1.dtb                   \
@@ -308,6 +333,8 @@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
        fsl-ls2088a-rdb-qspi.dtb \
        fsl-ls1088a-rdb.dtb \
        fsl-ls1088a-qds.dtb \
+       fsl-ls1028a-rdb.dtb \
+       fsl-ls1028a-qds.dtb \
        fsl-lx2160a-rdb.dtb \
        fsl-lx2160a-qds.dtb
 dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \
@@ -316,6 +343,7 @@ dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \
        fsl-ls1046a-qds-duart.dtb \
        fsl-ls1046a-qds-lpuart.dtb \
        fsl-ls1046a-rdb.dtb \
+       fsl-ls1046a-frwy.dtb \
        fsl-ls1012a-qds.dtb \
        fsl-ls1012a-rdb.dtb \
        fsl-ls1012a-2g5rdb.dtb \
@@ -480,6 +508,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
        sun50i-h5-orangepi-prime.dtb \
        sun50i-h5-orangepi-zero-plus2.dtb
 dtb-$(CONFIG_MACH_SUN50I_H6) += \
+       sun50i-h6-beelink-gs1.dtb \
        sun50i-h6-orangepi-lite2.dtb \
        sun50i-h6-orangepi-one-plus.dtb \
        sun50i-h6-pine-h64.dtb
@@ -494,7 +523,8 @@ dtb-$(CONFIG_MACH_SUN50I) += \
        sun50i-a64-pine64-plus.dtb \
        sun50i-a64-pine64.dtb \
        sun50i-a64-pinebook.dtb \
-       sun50i-a64-sopine-baseboard.dtb
+       sun50i-a64-sopine-baseboard.dtb \
+       sun50i-a64-teres-i.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \
        sun9i-a80-cubieboard4.dtb \
@@ -507,14 +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
-
-dtb-$(CONFIG_TARGET_TBS2910) += \
+       imx6q-logicpd.dtb \
+       imx6q-novena.dtb \
        imx6q-tbs2910.dtb
 
 dtb-$(CONFIG_MX6QDL) += \
@@ -522,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
 
@@ -542,7 +572,8 @@ dtb-$(CONFIG_MX6SLL) += imx6sll-evk.dtb
 
 dtb-$(CONFIG_MX6SX) += \
        imx6sx-sabreauto.dtb \
-       imx6sx-sdb.dtb
+       imx6sx-sdb.dtb \
+       imx6sx-softing-vining-2000.dtb
 
 dtb-$(CONFIG_MX6UL) += \
        imx6ul-geam.dtb \
@@ -560,10 +591,13 @@ dtb-$(CONFIG_MX6UL) += \
 dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri.dtb \
+       imx6ull-phycore-segin.dtb \
        imx6ull-dart-6ul.dtb
 
 dtb-$(CONFIG_ARCH_MX6) += \
-       imx6-colibri.dtb
+       imx6-apalis.dtb \
+       imx6-colibri.dtb \
+       imx6q-dhcom-pdk2.dtb
 
 dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
        imx7d-sdb-qspi.dtb \
@@ -577,8 +611,10 @@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
 dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb
 
 dtb-$(CONFIG_ARCH_IMX8) += \
-       fsl-imx8qxp-mek.dtb \
+       fsl-imx8qm-apalis.dtb \
        fsl-imx8qm-mek.dtb \
+       fsl-imx8qxp-colibri.dtb \
+       fsl-imx8qxp-mek.dtb
 
 dtb-$(CONFIG_ARCH_IMX8M) += fsl-imx8mq-evk.dtb
 
@@ -603,6 +639,9 @@ dtb-$(CONFIG_RCAR_GEN3) += \
        r8a77990-ebisu-u-boot.dtb \
        r8a77995-draak-u-boot.dtb
 
+dtb-$(CONFIG_RZA1) += \
+       r7s72100-gr-peach-u-boot.dtb
+
 dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \
        keystone-k2l-evm.dtb \
        keystone-k2e-evm.dtb \
@@ -698,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
@@ -719,6 +763,7 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
 
 dtb-$(CONFIG_TARGET_STM32MP1) += \
        stm32mp157a-dk1.dtb \
+       stm32mp157a-avenger96.dtb \
        stm32mp157c-dk2.dtb \
        stm32mp157c-ed1.dtb \
        stm32mp157c-ev1.dtb