Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 820ee9733a05dcf13997d9a43b771c73a8607048..c57a6460c6bdf43e0b4eeb6e5783c006347f3b0b 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -64,8 +64,10 @@ dtb-$(CONFIG_KIRKWOOD) += \
        kirkwood-pogo_e02.dtb \
        kirkwood-sheevaplug.dtb
 
-dtb-$(CONFIG_ARCH_OWL) += \
+dtb-$(CONFIG_MACH_S900) += \
        bubblegum_96.dtb
+dtb-$(CONFIG_MACH_S700) += \
+       s700-cubieboard7.dtb
 
 dtb-$(CONFIG_ROCKCHIP_PX30) += \
        px30-evb.dtb \
@@ -104,6 +106,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
 
 dtb-$(CONFIG_ROCKCHIP_RK3328) += \
        rk3328-evb.dtb \
+       rk3328-roc-cc.dtb \
        rk3328-rock64.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RK3368) += \
@@ -123,12 +126,14 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
        rk3399-leez-p710.dtb \
        rk3399-nanopc-t4.dtb \
        rk3399-nanopi-m4.dtb \
+       rk3399-nanopi-m4-2gb.dtb \
        rk3399-nanopi-neo4.dtb \
        rk3399-orangepi.dtb \
        rk3399-puma-ddr1333.dtb \
        rk3399-puma-ddr1600.dtb \
        rk3399-puma-ddr1866.dtb \
        rk3399-roc-pc.dtb \
+       rk3399-roc-pc-mezzanine.dtb \
        rk3399-rock-pi-4.dtb \
        rk3399-rock960.dtb \
        rk3399-rockpro64.dtb
@@ -147,7 +152,9 @@ dtb-$(CONFIG_ARCH_MESON) += \
        meson-gxl-s805x-libretech-ac.dtb \
        meson-gxl-s905x-libretech-cc.dtb \
        meson-gxl-s905x-khadas-vim.dtb \
+       meson-gxl-s905d-libretech-pc.dtb \
        meson-gxm-khadas-vim2.dtb \
+       meson-gxm-s912-libretech-pc.dtb \
        meson-axg-s400.dtb \
        meson-g12a-u200.dtb \
        meson-g12a-sei510.dtb \
@@ -189,25 +196,25 @@ dtb-$(CONFIG_ARCH_MVEBU) +=                       \
        armada-3720-turris-mox.dtb              \
        armada-3720-uDPU.dtb                    \
        armada-375-db.dtb                       \
+       armada-385-atl-x530.dtb                 \
+       armada-385-atl-x530DP.dtb               \
+       armada-385-db-88f6820-amc.dtb           \
+       armada-385-turris-omnia.dtb             \
        armada-388-clearfog.dtb                 \
        armada-388-gp.dtb                       \
        armada-388-helios4.dtb                  \
-       armada-385-db-88f6820-amc.dtb           \
-       armada-385-turris-omnia.dtb             \
-       armada-7040-db.dtb                      \
+       armada-38x-controlcenterdc.dtb          \
        armada-7040-db-nand.dtb                 \
+       armada-7040-db.dtb                      \
+       armada-8040-clearfog-gt-8k.dtb          \
        armada-8040-db.dtb                      \
        armada-8040-mcbin.dtb                   \
-       armada-8040-clearfog-gt-8k.dtb          \
+       armada-xp-crs305-1g-4s.dtb              \
+       armada-xp-db-xc3-24g4xg.dtb             \
        armada-xp-gp.dtb                        \
        armada-xp-maxbcm.dtb                    \
        armada-xp-synology-ds414.dtb            \
-       armada-xp-theadorable.dtb               \
-       armada-38x-controlcenterdc.dtb          \
-       armada-385-atl-x530.dtb                 \
-       armada-385-atl-x530DP.dtb               \
-       armada-xp-db-xc3-24g4xg.dtb             \
-       armada-xp-crs305-1g-4s.dtb
+       armada-xp-theadorable.dtb
 
 dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
        uniphier-ld11-global.dtb \
@@ -277,6 +284,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \
        zynqmp-zcu102-revA.dtb                  \
        zynqmp-zcu102-revB.dtb                  \
        zynqmp-zcu102-rev1.0.dtb                \
+       zynqmp-zcu102-rev1.1.dtb                \
        zynqmp-zcu104-revA.dtb                  \
        zynqmp-zcu104-revC.dtb                  \
        zynqmp-zcu106-revA.dtb                  \
@@ -372,7 +380,8 @@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
        fsl-ls1088a-rdb.dtb \
        fsl-ls1088a-qds.dtb \
        fsl-ls1028a-rdb.dtb \
-       fsl-ls1028a-qds.dtb \
+       fsl-ls1028a-qds-duart.dtb \
+       fsl-ls1028a-qds-lpuart.dtb \
        fsl-lx2160a-rdb.dtb \
        fsl-lx2160a-qds.dtb
 dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \
@@ -617,12 +626,14 @@ dtb-y += \
        imx6dl-icore.dtb \
        imx6dl-icore-mipi.dtb \
        imx6dl-icore-rqs.dtb \
+       imx6dl-mba6a.dtb \
+       imx6dl-mba6b.dtb \
        imx6dl-mamoj.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-pico.dtb \
        imx6dl-sabreauto.dtb \
        imx6dl-sabresd.dtb \
-       imx6dl-wandboard-revb1.dtb \
+       imx6dl-wandboard-revd1.dtb \
 
 endif
 
@@ -646,6 +657,8 @@ dtb-y += \
        imx6q-icore-rqs.dtb \
        imx6q-kp.dtb \
        imx6q-logicpd.dtb \
+       imx6q-mba6a.dtb \
+       imx6q-mba6b.dtb \
        imx6q-mccmon6.dtb\
        imx6q-nitrogen6x.dtb \
        imx6q-novena.dtb \
@@ -654,7 +667,7 @@ dtb-y += \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-tbs2910.dtb \
-       imx6q-wandboard-revb1.dtb \
+       imx6q-wandboard-revd1.dtb \
        imx6qp-sabreauto.dtb \
        imx6qp-sabresd.dtb \
        imx6qp-wandboard-revd1.dtb \
@@ -725,7 +738,8 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mq-evk.dtb \
        imx8mp-evk.dtb
 
-dtb-$(CONFIG_ARCH_IMXRT) += imxrt1050-evk.dtb
+dtb-$(CONFIG_ARCH_IMXRT) += imxrt1050-evk.dtb \
+       imxrt1020-evk.dtb
 
 dtb-$(CONFIG_RCAR_GEN2) += \
        r8a7790-lager-u-boot.dtb \
@@ -738,11 +752,11 @@ dtb-$(CONFIG_RCAR_GEN2) += \
        r8a7794-silk-u-boot.dtb
 
 dtb-$(CONFIG_RCAR_GEN3) += \
-       r8a7795-h3ulcb-u-boot.dtb \
-       r8a7795-salvator-x-u-boot.dtb \
-       r8a7796-m3ulcb-u-boot.dtb \
-       r8a7796-salvator-x-u-boot.dtb \
-       r8a77965-m3nulcb-u-boot.dtb \
+       r8a77950-ulcb-u-boot.dtb \
+       r8a77950-salvator-x-u-boot.dtb \
+       r8a77960-ulcb-u-boot.dtb \
+       r8a77960-salvator-x-u-boot.dtb \
+       r8a77965-ulcb-u-boot.dtb \
        r8a77965-salvator-x-u-boot.dtb \
        r8a77970-eagle-u-boot.dtb \
        r8a77980-condor-u-boot.dtb \
@@ -885,7 +899,8 @@ dtb-$(CONFIG_STM32MP15x) += \
        stm32mp157c-dk2.dtb \
        stm32mp157c-ed1.dtb \
        stm32mp157c-ev1.dtb \
-       stm32mp15xx-dhcom-pdk2.dtb
+       stm32mp15xx-dhcom-pdk2.dtb \
+       stm32mp15xx-dhcor-avenger96.dtb
 
 dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb
 dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \