From: Tom Rini <trini@konsulko.com>
Date: Wed, 17 Jan 2018 18:48:35 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2018.03-rc1~171
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=086ebcd40e9bf8efc520f1b177fd8e3cc0e506fa;p=oweals%2Fu-boot.git

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

086ebcd40e9bf8efc520f1b177fd8e3cc0e506fa
diff --cc arch/arm/dts/Makefile
index e22b52cbb6,11d6f17d1a..26b2a528e6
--- a/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