Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 68d2791c155f8b7f73cdd9b68e97fbecc0af7441..5656e0d10ed20f81d81e40f20852dfc2e5212c8e 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -29,12 +29,12 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
 dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3036-sdk.dtb \
+       rk3188-radxarock.dtb \
        rk3288-evb.dtb \
        rk3288-fennec.dtb \
        rk3288-firefly.dtb \
        rk3288-miqi.dtb \
        rk3288-popmetal.dtb \
-       rk3188-radxarock.dtb \
        rk3288-rock2-square.dtb \
        rk3288-tinker.dtb \
        rk3288-veyron-jerry.dtb \
@@ -153,6 +153,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=                               \
        socfpga_cyclone5_socdk.dtb                      \
        socfpga_cyclone5_de0_nano_soc.dtb                       \
        socfpga_cyclone5_de1_soc.dtb                    \
+       socfpga_cyclone5_de10_nano.dtb                  \
        socfpga_cyclone5_sockit.dtb                     \
        socfpga_cyclone5_socrates.dtb                   \
        socfpga_cyclone5_sr1500.dtb                     \
@@ -166,7 +167,7 @@ dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb \
        am571x-idk.dtb
 dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
 
-dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \
+dtb-$(CONFIG_ARCH_LS1021A) += ls1021a-qds-duart.dtb \
        ls1021a-qds-lpuart.dtb \
        ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \
        ls1021a-iot-duart.dtb