Merge git://git.denx.de/u-boot-usb

[u-boot] / arch / arm / dts / Makefile

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6a01759791110affff8f48447657a63cc8c9641c..9c735c672abce4087c7db6052590e6a75529ef5f 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=                         \
        socfpga_arria5_socdk.dtb                        \
        socfpga_cyclone5_socdk.dtb                      \
        socfpga_cyclone5_socrates.dtb
+dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
 
 dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \
        ls1021a-twr.dtb
@@ -94,6 +95,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-hummingbird.dtb \
        sun6i-a31-i7.dtb \
        sun6i-a31-m9.dtb \
+       sun6i-a31-mele-a1000g-quad.dtb \
        sun6i-a31-mixtile-loftq.dtb \
        sun6i-a31s-cs908.dtb \
        sun6i-a31s-primo81.dtb
@@ -120,18 +122,24 @@ dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-wits-pro-a20-dkt.dtb \
        sun7i-a20-yones-toptech-bd1078.dtb
 dtb-$(CONFIG_MACH_SUN8I_A23) += \
+       sun8i-a23-evb.dtb \
        sun8i-a23-ippo-q8h-v5.dtb \
        sun8i-a23-ippo-q8h-v1.2.dtb
 dtb-$(CONFIG_MACH_SUN8I_A33) += \
-       sun8i-a33-astar-mid756.dtb \
+       sun8i-a33-et-q8-v1.6.dtb \
+       sun8i-a33-ga10h-v1.1.dtb \
        sun8i-a33-ippo-q8h-v1.2-lcd1024x600.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \
        sun9i-a80-cubieboard4.dtb
 
+dtb-$(CONFIG_VF610) += vf500-colibri.dtb \
+       vf610-colibri.dtb
+
 targets += $(dtb-y)
 
-DTC_FLAGS += -R 4 -p 0x1000
+# Add any required device tree compiler flags here
+DTC_FLAGS +=
 
 PHONY += dtbs
 dtbs: $(addprefix $(obj)/, $(dtb-y))