hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/mach-omap2/Makefile
....@@ -7,7 +7,7 @@
77 -I$(srctree)/arch/arm/plat-omap/include
88
99 # Common support
10
-obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \
10
+obj-y := id.o io.o control.o devices.o fb.o pm.o \
1111 common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
1212 omap_device.o omap-headsmp.o sram.o
1313
....@@ -19,16 +19,21 @@
1919 obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
2020 obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
2121 obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)
22
-obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)
23
-obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common)
22
+obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common) $(secure-common)
23
+obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common)
2424 obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)
2525 obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)
2626
27
-ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)
27
+ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)
2828 obj-y += mcbsp.o
2929 endif
3030
3131 obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
32
+
33
+ifneq ($(CONFIG_MFD_CPCAP),)
34
+obj-y += pmic-cpcap.o
35
+endif
36
+
3237 obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o
3338
3439 # SMP support ONLY available for OMAP4
....@@ -41,17 +46,13 @@
4146 obj-$(CONFIG_SOC_AM43XX) += $(omap-4-5-common)
4247 obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-common) $(smp-y) sleep44xx.o
4348
44
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
45
-AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)
46
-AFLAGS_omap-smc.o :=-Wa,-march=armv7-a$(plus_sec)
47
-AFLAGS_sleep44xx.o :=-Wa,-march=armv7-a$(plus_sec)
49
+omap5-dra7-common-$(CONFIG_SOC_HAS_REALTIME_COUNTER) = timer.o
50
+obj-$(CONFIG_SOC_OMAP5) += $(omap5-dra7-common-y)
51
+obj-$(CONFIG_SOC_DRA7XX) += $(omap5-dra7-common-y)
4852
4953 # Functions loaded to SRAM
5054 obj-$(CONFIG_SOC_OMAP2420) += sram242x.o
5155 obj-$(CONFIG_SOC_OMAP2430) += sram243x.o
52
-
53
-AFLAGS_sram242x.o :=-Wa,-march=armv6
54
-AFLAGS_sram243x.o :=-Wa,-march=armv6
5556
5657 # Restart code (OMAP4/5 currently in omap4-common.c)
5758 obj-$(CONFIG_SOC_OMAP2420) += omap2-restart.o
....@@ -93,11 +94,6 @@
9394
9495 obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o
9596 obj-$(CONFIG_POWER_AVS_OMAP_CLASS3) += smartreflex-class3.o
96
-
97
-AFLAGS_sleep24xx.o :=-Wa,-march=armv6
98
-AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a$(plus_sec)
99
-AFLAGS_sleep33xx.o :=-Wa,-march=armv7-a$(plus_sec)
100
-AFLAGS_sleep43xx.o :=-Wa,-march=armv7-a$(plus_sec)
10197
10298 endif
10399
....@@ -229,17 +225,16 @@
229225
230226 # Platform specific device init code
231227
232
-omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o
233
-obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y)
234
-
235228 obj-y += omap_phy_internal.o
236229
237230 obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o
238231
239
-arch/arm/mach-omap2/pm-asm-offsets.s: arch/arm/mach-omap2/pm-asm-offsets.c
240
- $(call if_changed_dep,cc_s_c)
241
-
242
-include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE
232
+$(obj)/pm-asm-offsets.h: $(obj)/pm-asm-offsets.s FORCE
243233 $(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__)
244234
245
-$(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h
235
+$(obj)/sleep33xx.o $(obj)/sleep43xx.o: $(obj)/pm-asm-offsets.h
236
+
237
+targets += pm-asm-offsets.s
238
+clean-files += pm-asm-offsets.h
239
+
240
+obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o