Commit f191f40c authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-cleanup-a-for-3.7' of... 

Merge tag 'omap-cleanup-a-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-makefile-sparse

Clean up and standardize several parts of
arch/arm/mach-omap2/Makefile.  Beyond readability and diffstat
improvements, the series should reduce the risk of conflicts during
future cleanups by ensuring related lines are in the same section of the
Makefile.

Test results are available here:

http://www.pwsan.com/omap/testlogs/makefile_cleanup_3.7/20120911191710/
parents 68cb700c df47adb8

arch/arm/mach-omap2/Makefile

+44 −64
Original line number Original line Diff line number Diff line
@@ -4,36 +4,30 @@ 




# Common support

# Common support

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o





omap-2-3-common				= irq.o

# INTCPS IP block support - XXX should be moved to drivers/

hwmod-common				= omap_hwmod.o \

obj-$(CONFIG_ARCH_OMAP2)		+= irq.o

					  omap_hwmod_common_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= irq.o

clock-common				= clock.o clock_common_data.o \

obj-$(CONFIG_SOC_AM33XX)		+= irq.o

					  clkt_dpll.o clkt_clksel.o

secure-common				= omap-smc.o omap-secure.o





obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

# Secure monitor API support

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP3)		+= omap-smc.o omap-secure.o

obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4)		+= omap-smc.o omap-secure.o

obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)

obj-$(CONFIG_SOC_OMAP5)			+= omap-smc.o omap-secure.o

obj-$(CONFIG_SOC_OMAP5)	 += prm44xx.o $(hwmod-common) $(secure-common)





ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

obj-y += mcbsp.o

obj-y += mcbsp.o

endif

endif





obj-$(CONFIG_TWL4030_CORE)		+= omap_twl.o

obj-$(CONFIG_TWL4030_CORE)		+= omap_twl.o

obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)	+= sdrc.o





# SMP support ONLY available for OMAP4

# SMP support ONLY available for OMAP4





obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

omap-4-5-common				=  omap4-common.o omap-wakeupgen.o \

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o omap-wakeupgen.o

					   sleep44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= omap4-common.o omap-wakeupgen.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-4-5-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-common)





plus_sec := $(call as-instr,.arch_extension sec,+sec)

plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)

AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
@@ -58,6 +52,7 @@ obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o 
# SMS/SDRC

# SMS/SDRC

obj-$(CONFIG_ARCH_OMAP2)		+= sdrc2xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sdrc2xxx.o

# obj-$(CONFIG_ARCH_OMAP3)		+= sdrc3xxx.o

# obj-$(CONFIG_ARCH_OMAP3)		+= sdrc3xxx.o

obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)	+= sdrc.o





# OPP table initialization

# OPP table initialization

ifeq ($(CONFIG_PM_OPP),y)

ifeq ($(CONFIG_PM_OPP),y)
@@ -68,11 +63,11 @@ endif 




# Power Management

# Power Management

ifeq ($(CONFIG_PM),y)

ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o sleep24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o omap-mpuss-lowpower.o

obj-$(CONFIG_SOC_OMAP5)			+= omap-mpuss-lowpower.o

obj-$(CONFIG_ARCH_OMAP4)		+= sleep44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= omap-mpuss-lowpower.o sleep44xx.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o





obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o

obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
@@ -93,87 +88,71 @@ obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o 
endif

endif





# PRCM

# PRCM

omap-prcm-4-5-common			=  prcm.o cminst44xx.o cm44xx.o \

obj-y					+= prcm.o prm_common.o

					   prcm_mpu44xx.o prminst44xx.o \

obj-$(CONFIG_ARCH_OMAP2)		+= cm2xxx_3xxx.o prm2xxx_3xxx.o

					   vc44xx_data.o vp44xx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-y					+= prm_common.o

obj-$(CONFIG_ARCH_OMAP2)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= vc3xxx_data.o vp3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= vc3xxx_data.o vp3xxx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= prcm.o prm33xx.o cm33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= prm33xx.o cm33xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-prcm-4-5-common) prm44xx.o

omap-prcm-4-5-common			=  cminst44xx.o cm44xx.o prm44xx.o \

					   prcm_mpu44xx.o prminst44xx.o \

					   vc44xx_data.o vp44xx_data.o \

					   prm44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-prcm-4-5-common)





# OMAP voltage domains

# OMAP voltage domains

voltagedomain-common			:= voltage.o vc.o vp.o

obj-y					+= voltage.o vc.o vp.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= voltagedomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= voltagedomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP3)		+= voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= voltagedomains44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= voltagedomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= $(voltagedomain-common)

obj-$(CONFIG_SOC_AM33XX)		+= voltagedomains33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= voltagedomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(voltagedomain-common)





# OMAP powerdomain framework

# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o

obj-y					+= powerdomain.o powerdomain-common.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomains44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= powerdomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= $(powerdomain-common)

obj-$(CONFIG_SOC_AM33XX)		+= powerdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= powerdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= powerdomains33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= powerdomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(powerdomain-common)

obj-$(CONFIG_SOC_OMAP5)			+= powerdomain44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= powerdomain44xx.o





# PRCM clockdomain control

# PRCM clockdomain control

clockdomain-common			+= clockdomain.o

obj-y					+= clockdomain.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= clockdomains2420_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= clockdomains2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clockdomains2430_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clockdomains2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clockdomain-common)

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomains44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomains44xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clockdomain-common)

obj-$(CONFIG_SOC_AM33XX)		+= clockdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= clockdomain33xx.o

obj-$(CONFIG_SOC_AM33XX)		+= clockdomains33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= clockdomains33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clockdomain-common)

obj-$(CONFIG_SOC_OMAP5)			+= clockdomain44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= clockdomain44xx.o





# Clock framework

# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o

obj-y					+= clock.o clock_common_data.o \

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_sys.o

					   clkt_dpll.o clkt_clksel.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o

obj-$(CONFIG_ARCH_OMAP2)		+= clock2xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o clkt2xxx_sys.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o clock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o clock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o

obj-$(CONFIG_SOC_AM33XX)		+= dpll3xxx.o clock33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= clock33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clock-common)

obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o





# OMAP2 clock rate set data (old "OPP" data)

# OMAP2 clock rate set data (old "OPP" data)
@@ -181,6 +160,7 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o 
obj-$(CONFIG_SOC_OMAP2430)		+= opp2430_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= opp2430_data.o





# hwmod data

# hwmod data

obj-y					+= omap_hwmod_common_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_3xxx_ipblock_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_interconnect_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= omap_hwmod_2xxx_interconnect_data.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE