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

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

Conflicts:
	arch/arm64/Makefile
---

c877dd285464741cb4c87d07bfcb924d8acf4af3
diff --cc arch/arm64/Makefile
index 8cf59039ad8b,a254d2c2c0dc..27ad9166d012
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -71,9 -66,10 +71,13 @@@ zinstall install: vmlinu
  dtbs: scripts
  	$(Q)$(MAKE) $(build)=$(boot)/dts dtbs
  
 +Image.gz-dtb: vmlinux scripts dtbs
 +	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 +
+ PHONY += vdso_install
+ vdso_install:
+ 	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
+ 
  # We use MRPROPER_FILES and CLEAN_FILES now
  archclean:
  	$(Q)$(MAKE) $(clean)=$(boot)
diff --cc arch/arm64/boot/dts/Makefile
index 9a98a3a6e0b0,ef388176116d..4f197a097dcf
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,17 -1,11 +1,18 @@@
  dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb \
  				fvp-base-gicv2-psci.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb
+ dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.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