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

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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 8da32d83f76ca7546c77fd03d456db6d4763acf7..762429c463d1762e32bc52064498cb7bf1359c87 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -42,6 +42,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3288-veyron-mickey.dtb \
        rk3288-veyron-minnie.dtb \
        rk3328-evb.dtb \
+       rk3368-lion.dtb \
        rk3368-sheep.dtb \
        rk3368-geekbox.dtb \
        rk3368-px5-evb.dtb \
@@ -118,8 +119,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER_PXS2) += \
        uniphier-pxs2-vodka.dtb
 dtb-$(CONFIG_ARCH_UNIPHIER_PXS3) += \
        uniphier-pxs3-ref.dtb
-dtb-$(CONFIG_ARCH_UNIPHIER_SLD3) += \
-       uniphier-sld3-ref.dtb
 dtb-$(CONFIG_ARCH_UNIPHIER_SLD8) += \
        uniphier-sld8-ref.dtb
 
@@ -336,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \
 dtb-$(CONFIG_MACH_SUN50I) += \
        sun50i-a64-bananapi-m64.dtb \
        sun50i-a64-nanopi-a64.dtb \
+       sun50i-a64-olinuxino.dtb \
        sun50i-a64-orangepi-win.dtb \
        sun50i-a64-pine64-plus.dtb \
        sun50i-a64-pine64.dtb
@@ -357,6 +357,7 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
        imx6sll-evk.dtb \
        imx6dl-icore.dtb \
        imx6dl-icore-rqs.dtb \
+       imx6q-cm-fx6.dtb \
        imx6q-icore.dtb \
        imx6q-icore-rqs.dtb \
        imx6q-logicpd.dtb \