From: Mark Brown <broonie@linaro.org>
Date: Tue, 15 Apr 2014 17:12:51 +0000 (+0100)
Subject: Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz... 
X-Git-Tag: firefly_0821_release~3680^2~142
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3736e39e6a6e546d59f97aa6b6b040b118fe169f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz/android into linux-linaro-lsk-android
---

3736e39e6a6e546d59f97aa6b6b040b118fe169f
diff --cc arch/arm64/boot/dts/Makefile
index 24be4296c14c,8dc5d8e28a01..0f3c0d20c760
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,9 -1,15 +1,16 @@@
 -dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 +dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
 +				fvp-base-gicv2-psci.dtb
  
  targets += dtbs
- targets += $(dtb-y)
  
- dtbs: $(addprefix $(obj)/, $(dtb-y))
+ DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES))
+ ifneq ($(DTB_NAMES),)
+ DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
+ else
+ DTB_LIST := $(dtb-y)
+ endif
+ targets += $(DTB_LIST)
+ 
+ dtbs: $(addprefix $(obj)/, $(DTB_LIST))
  
  clean-files := *.dtb