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

diff --cc arch/arm64/boot/dts/Makefile
index 0f3c0d20c7602700dd5515e39d27f9d0d9a52ba3,675be339c648b5365b163da18de5dc04d795ff18..9a98a3a6e0b0ab50f62f103b5798982ce00b9b17
--- 1/arch/arm64/boot/dts/Makefile
--- 2/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

diff --cc scripts/Makefile.lib
Simple merge