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 bb979550c440f47e761549029d9738ffb75f8fb7..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
@@ -375,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 \
@@ -746,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 \
@@ -893,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 \