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

diff --combined 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 --combined scripts/Makefile.lib
index bd161eff6921ff4b0ddfa92645d57a72ee3fd59b,c4b37f6b5478c2ed457b254a1e4455955d6907aa..76fec094054576a14f2d80ac9812dc3db2be6b84
--- 1/scripts/Makefile.lib
--- 2/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@@ -152,6 -152,7 +152,7 @@@ ld_flags       = $(LDFLAGS) $(ldflags-y
  dtc_cpp_flags  = -Wp,-MD,$(depfile).pre.tmp -nostdinc                    \
                 -I$(srctree)/arch/$(SRCARCH)/boot/dts                   \
                 -I$(srctree)/arch/$(SRCARCH)/boot/dts/include           \
+                -I$(srctree)/include                                    \
                 -undef -D__DTS__
  
  # Finds the multi-part object the current object will be linked into
@@@ -273,18 -274,6 +274,18 @@@ $(obj)/%.dtb: $(src)/%.dts FORC
  
  dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
  
 +$(obj)/%.dtb: $(src)/%.dts FORCE
 +      $(call if_changed_dep,dtc)
 +
 +dtc-tmp = $(subst $(comma),_,$(dot-target).dts)
 +
 +quiet_cmd_dtc_cpp = DTC+CPP $@
 +cmd_dtc_cpp = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
 +      $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $(dtc-tmp)
 +
 +$(obj)/%.dtb: $(src)/%.dtsp FORCE
 +      $(call if_changed_dep,dtc_cpp)
 +
  # Bzip2
  # ---------------------------------------------------------------------------