Merge git://git.denx.de/u-boot-fsl-qoriq

diff --cc arch/arm/dts/Makefile
index e22b52cbb6eca1464f4012b2e959e76c6d8d1cdb,11d6f17d1a3bbb67260542a38d179c6868e8d3ff..26b2a528e60ad1e70b2f568c611937a5af1e105b
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -209,10 -209,10 +209,11 @@@ dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-
        fsl-ls1046a-rdb.dtb \
        fsl-ls1012a-qds.dtb \
        fsl-ls1012a-rdb.dtb \
+       fsl-ls1012a-2g5rdb.dtb \
        fsl-ls1012a-frdm.dtb
  
 -dtb-$(CONFIG_ARCH_SNAPDRAGON) += dragonboard410c.dtb
 +dtb-$(CONFIG_TARGET_DRAGONBOARD410C) += dragonboard410c.dtb
 +dtb-$(CONFIG_TARGET_DRAGONBOARD820C) += dragonboard820c.dtb
  
  dtb-$(CONFIG_STM32F4) += stm32f429-disco.dtb \
        stm32f469-disco.dtb