From: Mark Brown <broonie@linaro.org>
Date: Thu, 8 May 2014 11:11:39 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~134
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=afaa953324e290e4f06a690e01323d0e08299ee5;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

afaa953324e290e4f06a690e01323d0e08299ee5
diff --cc arch/arm64/boot/dts/Makefile
index 0f3c0d20c760,675be339c648..9a98a3a6e0b0
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,16 -1,10 +1,17 @@@
  dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
  				fvp-base-gicv2-psci.dtb
+ dtb-$(CONFIG_ARCH_VEXPRESS) += juno.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