Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc37c31b authored by Russell King's avatar Russell King
Browse files

ARM: rationalize versatile family Kconfig/Makefile 



Move leds and sched_clock build conditionals out of the Makefile into
the Kconfig file.  Move selection of HAVE_SCHED_CLOCK into the
platform Kconfig rather than duplicating it three times in the main
architecture Kconfig.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f093728c

arch/arm/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ config ARCH_REALVIEW 
	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -252,7 +251,6 @@ config ARCH_VERSATILE 
	select ARM_AMBA

	select ARM_VIC

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -270,7 +268,6 @@ config ARCH_VEXPRESS 
	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select HAVE_PATA_PLATFORM

	select ICST

	select PLAT_VERSATILE

arch/arm/plat-versatile/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -3,4 +3,12 @@ if PLAT_VERSATILE 
config PLAT_VERSATILE_CLCD

	bool



config PLAT_VERSATILE_LEDS

	def_bool y if LEDS_CLASS

	depends on ARCH_REALVIEW || ARCH_VERSATILE



config PLAT_VERSATILE_SCHED_CLOCK

	def_bool y if !ARCH_INTEGRATOR

	select HAVE_SCHED_CLOCK



endif

arch/arm/plat-versatile/Makefile

+3 −7
Original line number Diff line number Diff line 
obj-y	:= clock.o

ifneq ($(CONFIG_ARCH_INTEGRATOR),y)

obj-y	+= sched-clock.o

endif

ifeq ($(CONFIG_LEDS_CLASS),y)

obj-$(CONFIG_ARCH_REALVIEW) += leds.o

obj-$(CONFIG_ARCH_VERSATILE) += leds.o

endif

obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o

obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o

obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o