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

diff --combined arch/arm/dts/Makefile
index edc84a5d7dad855263cff99927021ebd2d16b579,e1a2b07474e09e593db63648add9d23c8ea5a2b1..e2c25844747290dd30ac19f952572cb0b35dccaf
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -149,7 -149,6 +149,7 @@@ dtb-$(CONFIG_AM43XX) += am437x-gp-evm.d
  dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb
  
  dtb-$(CONFIG_ARCH_SOCFPGA) +=                         \
 +      socfpga_arria10_socdk_sdmmc.dtb                 \
        socfpga_arria5_socdk.dtb                        \
        socfpga_cyclone5_is1.dtb                        \
        socfpga_cyclone5_mcvevk.dtb                     \
@@@ -346,7 -345,8 +346,8 @@@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.
        imx6ul-isiot-nand.dtb \
        imx6ul-opos6uldev.dtb
  
- dtb-$(CONFIG_MX7) += imx7-colibri.dtb
+ dtb-$(CONFIG_MX7) += imx7-colibri.dtb \
+       imx7d-sdb.dtb
  
  dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb