Allow build with CONFIG_PM disabled. Esp when bringing up new Silicon, this is a useful and often important requirement. Instead we allow for CONFIG_PM to be selectable as desired. Currently voltage files messup the build Note: this is just a proposal - I have'nt actually done a clean build, testing etc.. and was hoping to get some opinions why we have a hard dependency on PM for OMAP2 Cc: Paul <paul@xxxxxxxxx> Cc: Tony <tony@xxxxxxxxxxx> Cc: Kevin <khilman@xxxxxx> --- patch approx based on pm-core arch/arm/mach-omap2/Kconfig | 2 -- arch/arm/mach-omap2/Makefile | 12 ++++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b9d8a7b..1c99a01 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -7,8 +7,6 @@ config ARCH_OMAP2PLUS_TYPICAL default y select AEABI select REGULATOR - select PM - select PM_RUNTIME select VFP select NEON if ARCH_OMAP3 || ARCH_OMAP4 select SERIAL_OMAP diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 1d4d2ff..6d7f155 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -79,8 +79,7 @@ endif # PRCM obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o -obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \ - vc3xxx_data.o vp3xxx_data.o +obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o obj-$(CONFIG_ARCH_OMAP4) += prcm.o cminst44xx.o cm44xx.o \ prcm_mpu44xx.o prminst44xx.o # XXX The presence of cm2xxx_3xxx.o on the line below is temporary and @@ -88,8 +87,12 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cminst44xx.o cm44xx.o \ # use OMAP4-specific PRCM functions. obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ cm44xx.o prcm_mpu44xx.o \ - prminst44xx.o vc44xx_data.o \ - vp44xx_data.o + prminst44xx.o + +ifeq ($(CONFIG_PM),y) +# OMAP Voltage h/w module specific +obj-$(CONFIG_ARCH_OMAP3) += vc3xxx_data.o vp3xxx_data.o +obj-$(CONFIG_ARCH_OMAP4) += vc44xx_data.o vp44xx_data.o # OMAP voltage domains voltagedomain-common := voltage.o @@ -98,6 +101,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) \ voltagedomains3xxx_data.o obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) \ voltagedomains44xx_data.o +endif # OMAP powerdomain framework powerdomain-common += powerdomain.o powerdomain-common.o -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
