aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/Makefile
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2010-12-21 22:01:17 -0500
committerPaul Walmsley <paul@pwsan.com>2010-12-21 22:01:17 -0500
commit74bea6b9881f4b32f6c0379e46d2f5e16fd34a07 (patch)
tree5814d6a95d8edb64b9e4d01e75dfeb15edd8d972 /arch/arm/mach-omap2/Makefile
parentff2516fbef20ed9edd9cc2fc8b8b48d5cb5a932f (diff)
OMAP: powerdomain: Move static allocations from powerdomains.h to a .c file
powerdomains.h header today has only static definitions. Adding any function declarations into it and including it in multiple source file is expected to cause issues. Hence move all the static definitions from powerdomains.h file into powerdomains_data.c file. Also, create a new powerdomain section of the mach-omap2/Makefile, and rearrange the prcm-common part of the Makefile, now that the powerdomain code is in its own Makefile section. Signed-off-by: Rajendra Nayak <rnayak@ti.com> [paul@pwsan.com: rearrange Makefile changes, tweaked commit message] Signed-off-by: Paul Walmsley <paul@pwsan.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Tested-by: Kevin Hilman <khilman@deeprootsystems.com> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Rajendra Nayak <rnayak@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r--arch/arm/mach-omap2/Makefile17
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 4a8ea79a2b0c..00c27ebf709d 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -9,14 +9,13 @@ obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \
9omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o 9omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o
10hwmod-common = omap_hwmod.o \ 10hwmod-common = omap_hwmod.o \
11 omap_hwmod_common_data.o 11 omap_hwmod_common_data.o
12prcm-common = prcm.o powerdomain.o
13clock-common = clock.o clock_common_data.o \ 12clock-common = clock.o clock_common_data.o \
14 clockdomain.o clkt_dpll.o \ 13 clockdomain.o clkt_dpll.o \
15 clkt_clksel.o 14 clkt_clksel.o
16 15
17obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common) 16obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
18obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common) 17obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)
19obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common) 18obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common)
20 19
21obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o 20obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
22 21
@@ -74,9 +73,13 @@ endif
74endif 73endif
75 74
76# PRCM 75# PRCM
77obj-$(CONFIG_ARCH_OMAP2) += cm.o 76obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm.o
78obj-$(CONFIG_ARCH_OMAP3) += cm.o 77obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm.o
79obj-$(CONFIG_ARCH_OMAP4) += cm4xxx.o 78obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm4xxx.o
79
80# OMAP powerdomain framework
81powerdomain-common += powerdomain.o powerdomains_data.o
82obj-y += $(powerdomain-common)
80 83
81# Clock framework 84# Clock framework
82obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \ 85obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \