From: Olof Johansson Date: Thu, 27 Jun 2019 02:30:10 +0000 (-0700) Subject: Merge tag 'samsung-soc-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=da4d0b289142208893f6e685b0bc279fb3173478;p=linux.git Merge tag 'samsung-soc-5.3' of https://git./linux/kernel/git/krzk/linux into arm/soc Samsung mach/soc changes for v5.3 Only cleanups and minor fixes. * tag 'samsung-soc-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos: Cleanup cppcheck shifting warning ARM: exynos: Only build MCPM support if used ARM: exynos: Make ARCH_EXYNOS3 a default option Signed-off-by: Olof Johansson --- da4d0b289142208893f6e685b0bc279fb3173478 diff --cc arch/arm/mach-exynos/Makefile index 5ccf9d7e58d42,5abf3db23912b..0fd3fcf8bfb0d --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@@ -14,5 -14,9 +14,5 @@@ obj-$(CONFIG_PM_SLEEP) += suspend. obj-$(CONFIG_SMP) += platsmp.o headsmp.o - obj-$(CONFIG_MCPM) += mcpm-exynos.o -plus_sec := $(call as-instr,.arch_extension sec,+sec) -AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) -AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec) - + obj-$(CONFIG_EXYNOS_MCPM) += mcpm-exynos.o CFLAGS_mcpm-exynos.o += -march=armv7-a