On Thu, 2016-02-04 at 20:20:17 +0200, Grygorii Strashko wrote: > This patch intended to fix following cases: > - SoC-A has ARM GT, defines DT node for ARM GT and selects ARM_GLOBAL_TIMER > statically in Kconfig file. SoC-B has ARM GT and defines DT node for ARM GT, > but do not selects ARM_GLOBAL_TIMER statically in Kconfig file. In case of > multiplatform build ARM GT will be implicitly enabled for SoC-B. > > - There is no way to disable ARM GT without modifying Kconfig file, > once ARM_GLOBAL_TIMER is selected statically in Kconfig file. > > Hence, fix above case by defining both HAVE_ARM_GLOBAL_TIMER and > ARM_GLOBAL_TIMER as recommended by 'Adding common features and make > the usage configurable' section in kconfig-language.txt. All places in > ARM folder where ARM_GLOBAL_TIMER was used now replaced on > HAVE_ARM_GLOBAL_TIMER. > > Cc: Florian Fainelli <f.fainelli at gmail.com> > Cc: Russell King <linux at arm.linux.org.uk> > Cc: Wei Xu <xuwei5 at hisilicon.com> > Cc: Shawn Guo <shawnguo at kernel.org> > Cc: Sascha Hauer <kernel at pengutronix.de> > Cc: Srinivas Kandagatla <srinivas.kandagatla at gmail.com> > Cc: Maxime Coquelin <maxime.coquelin at st.com> > Cc: Masahiro Yamada <yamada.masahiro at socionext.com> > Cc: Liviu Dudau <liviu.dudau at arm.com> > Cc: Sudeep Holla <sudeep.holla at arm.com> > Cc: Jun Nie <jun.nie at linaro.org> > Cc: Michal Simek <michal.simek at xilinx.com> > Cc: "S?ren Brinkmann" <soren.brinkmann at xilinx.com> > Cc: Daniel Lezcano <daniel.lezcano at linaro.org> > > Signed-off-by: Grygorii Strashko <grygorii.strashko at ti.com> > --- [...] > diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig > index fd0aeeb..3165720 100644 > --- a/arch/arm/mach-zynq/Kconfig > +++ b/arch/arm/mach-zynq/Kconfig > @@ -5,7 +5,7 @@ config ARCH_ZYNQ > select ARCH_SUPPORTS_BIG_ENDIAN > select ARM_AMBA > select ARM_GIC > - select ARM_GLOBAL_TIMER if !CPU_FREQ > + select HAVE_ARM_GLOBAL_TIMER if !CPU_FREQ We actually have this issue, as we don't want to use GT when CPU_FREQ is enabled. But with this change the 'if !CPU_FREQ' becomes obsolete. Acked-by: S?ren Brinkmann <soren.brinkmann at xilinx.com> S?ren
