From: Mark Brown <broonie@linaro.org>
Date: Thu, 18 Jul 2013 15:46:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~236
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9bca3d7f7c5865700303e8bce0eac57bab76bcc7;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk

Conflicts (look like simple add/add stuff):
	arch/arm/Kconfig
	arch/arm/common/Makefile
---

9bca3d7f7c5865700303e8bce0eac57bab76bcc7
diff --cc arch/arm/common/Makefile
index 6073ffb8906e,f27d6a7af57f..462cd580fc2d
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@ -14,7 -14,6 +14,9 @@@ obj-$(CONFIG_SHARP_SCOOP)	+= scoop.
  obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o
  obj-$(CONFIG_ARM_TIMER_SP804)	+= timer-sp.o
  obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
- AFLAGS_mcpm_head.o		:= -march=armv7-a
- AFLAGS_vlock.o			:= -march=armv7-a
 +obj-$(CONFIG_BL_SWITCHER)	+= bL_switcher.o
 +obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o
++
+ AFLAGS_mcpm_head.o		:= -march=armv7-a
+ AFLAGS_vlock.o			:= -march=armv7-a
+ CFLAGS_REMOVE_mcpm_entry.o	= -pg