msm: Cleanup Makefiles under arch/arm/mach-msm (e0d6599a) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/Makefile

+0 −200

Original line number	Diff line number	Diff line
		@@ -10,41 +10,14 @@ obj-$(CONFIG_USE_OF) += board-dt.o
		obj-$(CONFIG_DEBUG_FS) += nohlt.o clock-debug.o
		obj-$(CONFIG_KEXEC) += msm_kexec.o

		obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o
		ifndef CONFIG_ARCH_MSM8X60
		obj-$(CONFIG_MSM_PROC_COMM) += clock-pcom.o
		obj-$(CONFIG_MSM_PROC_COMM) += vreg.o mpp.o
		ifdef CONFIG_MSM_PROC_COMM
		ifndef CONFIG_ARCH_FSM9XXX
		obj-$(CONFIG_REGULATOR) += footswitch-pcom.o
		endif
		obj-$(CONFIG_DEBUG_FS) += pmic_debugfs.o
		endif
		endif

		obj-y += acpuclock.o
		obj-$(CONFIG_ARCH_MSM_KRAIT) += clock-krait.o
		obj-$(CONFIG_HW_PERF_EVENTS) += perf_trace_counters.o
		obj-$(CONFIG_ARCH_MSM7X27) += acpuclock-7627.o acpuclock-8625q.o clock-pll.o
		obj-$(CONFIG_ARCH_MSM_KRAIT) += msm-krait-l2-accessors.o perf_event_msm_krait_l2.o
		obj-$(CONFIG_ARCH_MSM_KRAIT) += krait-scm.o
		obj-$(CONFIG_ARCH_MSM9625) += perf_event_msm_pl310.o
		obj-$(CONFIG_DEBUG_FS) += perf_debug.o

		ifndef CONFIG_MSM_SMP
		obj-$(CONFIG_ARCH_MSM_SCORPION) += msm_fault_handlers.o
		endif

		obj-$(CONFIG_MSM_VIC) += irq-vic.o

		ifdef CONFIG_ARCH_QSD8X50
		obj-$(CONFIG_MSM_SOC_REV_NONE) += acpuclock-8x50.o
		endif

		obj-$(CONFIG_SMP) += headsmp.o platsmp.o
		ifdef CONFIG_ARCH_MSM8625
		obj-$(CONFIG_SMP) += platsmp-8625.o
		endif
		obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

		obj-$(CONFIG_MSM_AVS_HW) += avs.o
		@@ -53,9 +26,6 @@ obj-$(CONFIG_CPU_V7) += idle-v7.o
		obj-$(CONFIG_MSM_JTAG) += jtag-fuse.o jtag.o
		obj-$(CONFIG_MSM_JTAG_MM) += jtag-fuse.o jtag-mm.o

		msm-etm-objs := etm.o
		obj-$(CONFIG_MSM_ETM) += msm-etm.o

		quiet_cmd_mkrpcsym = MKCAP $@
		cmd_mkrpcsym = $(PERL) $(srctree)/$(src)/mkrpcsym.pl $< $@

		@@ -85,14 +55,7 @@ obj-$(CONFIG_MSM_PIL_GSS) += pil-gss.o
		obj-$(CONFIG_MSM_PIL_PRONTO) += pil-pronto.o
		obj-$(CONFIG_MSM_PIL_VENUS) += pil-venus.o
		obj-$(CONFIG_MSM_PIL_VPU) += pil-vpu.o
		obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
		obj-$(CONFIG_ARCH_FSM9XXX) += sirc-fsm9xxx.o
		obj-$(CONFIG_MSM_FIQ_SUPPORT) += fiq_glue.o
		obj-$(CONFIG_MACH_TROUT) += board-trout-rfkill.o
		obj-$(CONFIG_MSM_SDIO_AL) += sdio_al.o
		obj-$(CONFIG_MSM_SDIO_AL) += sdio_al_test.o
		obj-$(CONFIG_MSM_SDIO_AL) += sdio_al_dloader.o
		obj-$(CONFIG_MSM_SDIO_DMUX) += sdio_dmux.o
		obj-$(CONFIG_MSM_BAM_DMUX) += bam_dmux.o
		obj-$(CONFIG_MSM_SMD_LOGGING) += smem_log.o
		obj-$(CONFIG_MSM_IPC_LOGGING) += ipc_logging.o
		@@ -100,22 +63,9 @@ ifdef CONFIG_DEBUG_FS
		obj-$(CONFIG_MSM_IPC_LOGGING) += ipc_logging_debug.o
		endif
		obj-y += socinfo.o
		obj-$(CONFIG_ARCH_MSM7X01A) += nand_partitions.o
		obj-$(CONFIG_ARCH_MSM7X25) += nand_partitions.o
		obj-$(CONFIG_ARCH_MSM7X27) += nand_partitions.o
		obj-$(CONFIG_ARCH_MSM7X30) += nand_partitions.o
		obj-$(CONFIG_ARCH_QSD8X50) += nand_partitions.o
		obj-$(CONFIG_ARCH_FSM9XXX) += nand_partitions.o
		obj-$(CONFIG_ARCH_MSM9615) += nand_partitions.o
		obj-$(CONFIG_ARCH_MSM8625) += nand_partitions.o
		obj-$(CONFIG_ARCH_MSM7X27A) += nand_partitions.o
		obj-$(CONFIG_MSM_SDIO_TTY) += sdio_tty.o
		obj-$(CONFIG_MSM_SMD_TTY) += smd_tty.o
		obj-$(CONFIG_MSM_SMD_QMI) += smd_qmi.o
		obj-$(CONFIG_MSM_SMD_PKT) += smd_pkt.o
		obj-$(CONFIG_MSM_SDIO_CMUX) += sdio_cmux.o
		obj-$(CONFIG_MSM_DSPS) += msm_dsps.o
		obj-$(CONFIG_MSM_SDIO_CTL) += sdio_ctl.o
		obj-$(CONFIG_MSM_SMD_NMEA) += smd_nmea.o
		obj-$(CONFIG_MSM_RESET_MODEM) += reset_modem.o
		obj-$(CONFIG_MSM_IPC_ROUTER_SMD_XPRT) += ipc_router_smd_xprt.o
		@@ -132,62 +82,28 @@ obj-$(CONFIG_MSM_ONCRPCROUTER) += smd_rpcrouter_servers.o
		obj-$(CONFIG_MSM_ONCRPCROUTER) += smd_rpcrouter_clients.o
		obj-$(CONFIG_MSM_ONCRPCROUTER) += smd_rpcrouter_xdr.o
		obj-$(CONFIG_MSM_ONCRPCROUTER) += rpcrouter_smd_xprt.o
		obj-$(CONFIG_MSM_RPC_SDIO_XPRT) += rpcrouter_sdio_xprt.o
		obj-$(CONFIG_MSM_RPC_PING) += ping_mdm_rpc_client.o
		obj-$(CONFIG_MSM_RPC_PROC_COMM_TEST) += proc_comm_test.o
		obj-$(CONFIG_MSM_RPC_PING) += ping_mdm_rpc_client.o ping_apps_server.o
		obj-$(CONFIG_MSM_RPC_OEM_RAPI) += oem_rapi_client.o
		obj-$(CONFIG_MSM_RPC_WATCHDOG) += rpc_dog_keepalive.o
		obj-$(CONFIG_MSM_RPCSERVER_WATCHDOG) += rpc_server_dog_keepalive.o
		obj-$(CONFIG_MSM_RPCSERVER_TIME_REMOTE) += rpc_server_time_remote.o
		obj-$(CONFIG_MSM_DALRPC) += dal.o
		obj-$(CONFIG_MSM_DALRPC_TEST) += dal_remotetest.o
		obj-$(CONFIG_ARCH_MSM7X30) += dal_axi.o
		obj-$(CONFIG_ARCH_MSM7X27A) += dal_axi.o
		obj-$(CONFIG_MSM_ADSP) += qdsp5/
		obj-$(CONFIG_MSM7KV2_AUDIO) += qdsp5v2/
		obj-$(CONFIG_MSM_RPCSERVER_HANDSET) += rpc_server_handset.o
		obj-$(CONFIG_MSM_QDSP6) += qdsp6/
		obj-$(CONFIG_MSM8X60_AUDIO) += qdsp6v2/
		obj-$(CONFIG_MSM_AUDIO_QDSP6) += qdsp6v2/
		obj-$(CONFIG_MSM_AUDIO_QDSP6V2) += qdsp6v2/
		obj-$(CONFIG_MSM_HW3D) += hw3d.o
		obj-$(CONFIG_PM) += pm-boot.o
		obj-$(CONFIG_MSM_IDLE_STATS) += pm-stats.o
		obj-$(CONFIG_MSM_PM2) += pm2.o
		obj-$(CONFIG_MSM_NOPM) += no-pm.o

		obj-$(CONFIG_MSM_PCIE) += pcie.o pcie_irq.o

		obj-$(CONFIG_MSM_SPM_V1) += spm.o
		obj-$(CONFIG_MSM_SPM_V2) += spm-v2.o spm_devices.o

		obj-$(CONFIG_MSM_DMA_TEST) += dma_test.o
		obj-$(CONFIG_SURF_FFA_GPIO_KEYPAD) += keypad-surf-ffa.o

		obj-$(CONFIG_ARCH_MSM7X01A) += board-halibut.o devices-msm7x01a.o clock-pcom-lookup.o
		obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o
		obj-$(CONFIG_MACH_TROUT) += board-trout-keypad.o board-trout-panel.o
		obj-$(CONFIG_MACH_TROUT) += htc_akm_cal.o htc_wifi_nvs.o htc_acoustic.o
		obj-$(CONFIG_MACH_TROUT) += board-trout-mmc.o board-trout-wifi.o
		obj-$(CONFIG_ARCH_QSD8X50) += devices-qsd8x50.o clock-pcom-lookup.o
		obj-$(CONFIG_MACH_QSD8X50_SURF) += board-qsd8x50.o
		obj-$(CONFIG_MACH_QSD8X50_FFA) += board-qsd8x50.o
		obj-$(CONFIG_ARCH_MSM8X60) += devices-msm8x60.o clock-local.o clock-8x60.o acpuclock-8x60.o clock-pll.o
		obj-$(CONFIG_ARCH_MSM8X60) += clock-rpm.o
		obj-$(CONFIG_ARCH_MSM8X60) += saw-regulator.o
		obj-$(CONFIG_ARCH_MSM8X60) += footswitch-8x60.o
		obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

		ifdef CONFIG_MSM_RPM_REGULATOR
		obj-y += rpm-regulator.o
		obj-$(CONFIG_ARCH_MSM8X60) += rpm-regulator-8660.o
		obj-$(CONFIG_ARCH_MSM8960) += rpm-regulator-8960.o
		obj-$(CONFIG_ARCH_MSM9615) += rpm-regulator-9615.o
		obj-$(CONFIG_ARCH_MSM8930) += rpm-regulator-8930.o
		obj-$(CONFIG_ARCH_APQ8064) += rpm-regulator-8960.o
		endif

		obj-$(CONFIG_MSM_RPM_REGULATOR_SMD) += rpm-regulator-smd.o
		obj-$(CONFIG_MSM_SPM_REGULATOR) += spm-regulator.o

		@@ -200,78 +116,13 @@ obj-$(CONFIG_MSM_SYSMON_COMM) += sysmon.o

		obj-$(CONFIG_CPU_IDLE) += cpuidle.o

		ifdef CONFIG_MSM_CAMERA_V4L2
		obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60-camera.o
		endif
		obj-$(CONFIG_ARCH_FSM9XXX) += devices-fsm9xxx.o
		obj-$(CONFIG_ARCH_FSM9XXX) += clock-fsm9xxx.o clock-local.o acpuclock-fsm9xxx.o
		obj-$(CONFIG_ARCH_FSM9XXX) += dfe-fsm9xxx.o rfic-fsm9xxx.o
		obj-$(CONFIG_ARCH_FSM9XXX) += restart-fsm9xxx.o xo-fsm9xxx.o
		obj-$(CONFIG_ARCH_FSM9900) += board-fsm9900.o board-fsm9900-gpiomux.o

		obj-$(CONFIG_MSM_WATCHDOG) += msm_watchdog.o
		obj-$(CONFIG_MSM_WATCHDOG) += msm_watchdog_asm.o
		obj-$(CONFIG_MSM_WATCHDOG_V2) += msm_watchdog_v2.o
		obj-$(CONFIG_MSM_MEMORY_DUMP) += msm_memory_dump.o
		obj-$(CONFIG_MACH_MSM8X60_SURF) += board-msm8x60.o
		obj-$(CONFIG_MACH_MSM8X60_FFA) += board-msm8x60.o
		obj-$(CONFIG_MACH_MSM8X60_FLUID) += board-msm8x60.o
		obj-$(CONFIG_MACH_MSM8X60_DRAGON) += board-msm8x60.o
		obj-$(CONFIG_MACH_TYPE_MSM8X60_FUSION) += board-msm8x60.o mdm.o
		obj-$(CONFIG_MACH_MSM8X60_FUSN_FFA) += board-msm8x60.o mdm.o
		obj-$(CONFIG_TROUT_H2W) += board-trout-h2w.o
		obj-$(CONFIG_TROUT_BATTCHG) += htc_battery.o
		obj-$(CONFIG_TROUT_PWRSINK) += htc_pwrsink.o
		obj-$(CONFIG_ARCH_MSM7X27) += clock-pcom-lookup.o
		obj-$(CONFIG_MACH_MSM7X27_SURF) += board-msm7x27.o devices-msm7x27.o
		obj-$(CONFIG_MACH_MSM7X27_FFA) += board-msm7x27.o devices-msm7x27.o
		obj-$(CONFIG_ARCH_MSM7X27A) += clock-pcom-lookup.o devices-msm7x27a.o
		board-7627a-all-objs += board-msm7627a-storage.o board-msm7627a-bt.o board-msm7627a-camera.o
		board-7627a-all-objs += audio-7627a-devices.o
		board-7627a-all-objs += board-msm7627a-display.o board-msm7627a-wlan.o board-msm7627a-io.o
		obj-$(CONFIG_MACH_MSM7X27A_RUMI3) += board-msm7x27a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM7X27A_SURF) += board-msm7x27a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM7X27A_FFA) += board-msm7x27a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM7627A_QRD1) += board-qrd7627a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM7627A_QRD3) += board-qrd7627a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM7627A_EVB) += board-qrd7627a.o board-7627a-all.o
		obj-$(CONFIG_ARCH_MSM8625) += msm_smem_iface.o devices-msm7x27a.o clock-pcom-lookup.o mpm-8625.o
		obj-$(CONFIG_MACH_MSM8625_RUMI3) += board-msm7x27a.o
		obj-$(CONFIG_MACH_MSM8625_SURF) += board-msm7x27a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM8625_EVB) += board-qrd7627a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM8625_QRD7) += board-qrd7627a.o board-7627a-all.o
		obj-$(CONFIG_MACH_QRD_SKUD_PRIME) += board-qrd7627a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM8625_FFA) += board-msm7x27a.o board-7627a-all.o
		obj-$(CONFIG_MACH_MSM8625_EVT) += board-msm7x27a.o board-7627a-all.o
		obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o memory_topology.o
		obj-$(CONFIG_ARCH_MSM7X30) += clock-local.o clock-7x30.o acpuclock-7x30.o clock-pll.o
		obj-$(CONFIG_MACH_MSM7X25_SURF) += board-msm7x27.o devices-msm7x25.o
		obj-$(CONFIG_MACH_MSM7X25_FFA) += board-msm7x27.o devices-msm7x25.o
		obj-$(CONFIG_ARCH_MSM8960) += clock-local.o clock-dss-8960.o clock-8960.o clock-rpm.o clock-pll.o
		obj-$(CONFIG_ARCH_MSM8960) += footswitch-8x60.o
		obj-$(CONFIG_ARCH_MSM8960) += memory_topology.o
		obj-$(CONFIG_ARCH_MSM8960) += saw-regulator.o
		obj-$(CONFIG_ARCH_MSM8960) += devices-8960.o
		obj-$(CONFIG_ARCH_APQ8064) += devices-8960.o devices-8064.o
		board-8960-all-objs += board-8960.o board-8960-camera.o board-8960-display.o board-8960-pmic.o board-8960-storage.o board-8960-gpiomux.o
		board-8930-all-objs += board-8930.o board-8930-camera.o board-8930-display.o board-8930-pmic.o board-8930-storage.o board-8930-gpiomux.o devices-8930.o board-8930-gpu.o
		board-8064-all-objs += board-8064.o board-8064-pmic.o board-8064-storage.o board-8064-gpiomux.o board-8064-camera.o board-8064-display.o board-8064-gpu.o
		obj-$(CONFIG_MACH_MSM8960_CDP) += board-8960-all.o board-8960-regulator.o
		obj-$(CONFIG_MACH_MSM8960_MTP) += board-8960-all.o board-8960-regulator.o
		obj-$(CONFIG_MACH_MSM8960_FLUID) += board-8960-all.o board-8960-regulator.o
		obj-$(CONFIG_MACH_MSM8930_CDP) += board-8930-all.o board-8930-regulator-pm8038.o board-8930-regulator-pm8917.o
		obj-$(CONFIG_MACH_MSM8930_MTP) += board-8930-all.o board-8930-regulator-pm8038.o board-8930-regulator-pm8917.o
		obj-$(CONFIG_MACH_MSM8930_FLUID) += board-8930-all.o board-8930-regulator-pm8038.o board-8930-regulator-pm8917.o
		obj-$(CONFIG_PM8921_BMS) += bms-batterydata.o bms-batterydata-desay.o batterydata-lib.o
		obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o batterydata-lib.o
		obj-$(CONFIG_QPNP_BMS) += bms-batterydata-oem.o bms-batterydata-qrd-4v35-2000mah.o bms-batterydata-qrd-4v2-1300mah.o
		obj-$(CONFIG_MACH_APQ8064_CDP) += board-8064-all.o board-8064-regulator.o
		obj-$(CONFIG_MACH_APQ8064_MTP) += board-8064-all.o board-8064-regulator.o
		obj-$(CONFIG_MACH_APQ8064_LIQUID) += board-8064-all.o board-8064-regulator.o
		obj-$(CONFIG_MACH_MPQ8064_HRD) += board-8064-all.o board-8064-regulator.o board-8064-bt.o
		obj-$(CONFIG_MACH_MPQ8064_DTV) += board-8064-all.o board-8064-regulator.o
		obj-$(CONFIG_ARCH_MSM9615) += board-9615.o devices-9615.o board-9615-regulator.o board-9615-gpiomux.o board-9615-storage.o board-9615-display.o
		obj-$(CONFIG_ARCH_MSM9615) += clock-local.o clock-9615.o acpuclock-9615.o clock-rpm.o clock-pll.o
		obj-$(CONFIG_ARCH_APQ8084) += board-8084.o board-8084-gpiomux.o
		obj-$(CONFIG_ARCH_APQ8084) += clock-local2.o clock-pll.o clock-8084.o clock-rpm.o clock-voter.o clock-mdss-8974.o
		obj-$(CONFIG_ARCH_APQ8084) += clock-krait-8974.o
		@@ -279,7 +130,6 @@ obj-$(CONFIG_ARCH_MSM8974) += board-8974.o board-8974-gpiomux.o
		obj-$(CONFIG_ARCH_MSM8974) += clock-krait-8974.o
		obj-$(CONFIG_ARCH_MSM8974) += clock-local2.o clock-pll.o clock-8974.o clock-rpm.o clock-voter.o clock-mdss-8974.o
		obj-$(CONFIG_ARCH_MSM8974) += gdsc.o
		obj-$(CONFIG_ARCH_MSM9625) += gdsc.o
		obj-$(CONFIG_ARCH_MSM8226) += gdsc.o
		obj-$(CONFIG_ARCH_MSM8610) += gdsc.o
		obj-$(CONFIG_ARCH_MPQ8092) += gdsc.o
		@@ -289,8 +139,6 @@ obj-$(CONFIG_KRAIT_REGULATOR) += krait-regulator.o krait-regulator-pmic.o
		obj-$(CONFIG_ARCH_MSMKRYPTON) += board-krypton.o board-krypton-gpiomux.o
		obj-$(CONFIG_ARCH_MSMSAMARIUM) += board-samarium.o board-samarium-gpiomux.o
		obj-$(CONFIG_ARCH_MSMSAMARIUM) += clock-local2.o clock-pll.o clock-rpm.o clock-samarium.o clock-krait-8974.o clock-mdss-8974.o
		obj-$(CONFIG_ARCH_MSM9625) += board-9625.o board-9625-gpiomux.o
		obj-$(CONFIG_ARCH_MSM9625) += clock-local2.o clock-pll.o clock-9625.o clock-rpm.o clock-voter.o acpuclock-9625.o acpuclock-cortex.o
		obj-$(CONFIG_ARCH_MPQ8092) += board-8092.o board-8092-gpiomux.o
		obj-$(CONFIG_ARCH_MPQ8092) += clock-local2.o clock-pll.o clock-rpm.o clock-voter.o clock-8092.o
		obj-$(CONFIG_ARCH_MSM8226) += board-8226.o board-8226-gpiomux.o
		@@ -304,22 +152,9 @@ obj-$(CONFIG_ARCH_MSMKRYPTON) += clock-local2.o clock-pll.o clock-krypton.o cloc

		obj-$(CONFIG_MSM_PM8X60) += pm-8x60.o pm-data.o

		obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o board-sapphire-gpio.o
		obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire-keypad.o board-sapphire-panel.o
		obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire-mmc.o board-sapphire-wifi.o
		obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire-rfkill.o msm_vibrator.o

		CFLAGS_msm_vibrator.o += -Idrivers/staging/android
		CFLAGS_board-9615.o += -Idrivers/usb/gadget

		obj-$(CONFIG_ARCH_FSM9XXX) += board-fsm9xxx.o

		obj-$(CONFIG_TROUT_BATTCHG) += htc_battery.o

		obj-$(CONFIG_HTC_PWRSINK) += htc_pwrsink.o
		obj-$(CONFIG_HTC_HEADSET) += htc_headset.o
		obj-$(CONFIG_MSM_RMT_STORAGE_CLIENT) += rmt_storage_client.o
		obj-$(CONFIG_MSM_SDIO_SMEM) += sdio_smem.o
		obj-$(CONFIG_MSM_RPM) += rpm.o rpm_resources.o
		obj-$(CONFIG_MSM_LPM_TEST) += test-lpm.o
		obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd.o lpm_levels.o
		@@ -330,35 +165,18 @@ obj-$(CONFIG_MSM_RPM_RBCPR_STATS_LOG) += rpm_rbcpr_stats.o
		obj-$(CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG) += rpm_rbcpr_stats_v2.o
		obj-$(CONFIG_MSM_RPM_LOG) += rpm_log.o
		obj-$(CONFIG_MSM_TZ_LOG) += tz_log.o
		obj-$(CONFIG_MSM_XO) += msm_xo.o
		obj-$(CONFIG_MSM_BUS_SCALING) += msm_bus/
		obj-$(CONFIG_MSM_BUSPM_DEV) += msm-buspm-dev.o

		obj-$(CONFIG_MSM_IOMMU) += iommu_domains.o
		ifdef CONFIG_IOMMU_SUPPORT
		obj-$(CONFIG_ARCH_MSM8960) += devices-iommu.o
		obj-$(CONFIG_ARCH_MSM8930) += devices-iommu.o
		obj-$(CONFIG_ARCH_MSM8064) += devices-iommu.o
		endif

		obj-$(CONFIG_MSM_EVENT_TIMER) += event_timer.o

		ifdef CONFIG_VCM
		obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60-vcm.o
		endif
		obj-$(CONFIG_MSM_OCMEM) += ocmem.o ocmem_allocator.o ocmem_notifier.o
		obj-$(CONFIG_MSM_OCMEM) += ocmem_sched.o ocmem_api.o ocmem_rdm.o ocmem_core.o
		obj-$(CONFIG_SENSORS_ADSP) += sensors_adsp.o

		obj-$(CONFIG_ARCH_MSM7X27) += gpiomux-7x27.o gpiomux-v1.o gpiomux.o
		obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o gpiomux-v1.o gpiomux.o
		obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
		obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_MSM8960) += gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_APQ8064) += gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_MSM9615) += gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_MSM8974) += gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_MSM9625) += gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_MSMKRYPTON) += gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_MSMSAMARIUM) += gpiomux-v2.o gpiomux.o
		obj-$(CONFIG_ARCH_MPQ8092) += gpiomux-v2.o gpiomux.o
		@@ -371,19 +189,9 @@ obj-$(CONFIG_MSM_SLEEP_STATS_DEVICE) += idle_stats_device.o
		obj-$(CONFIG_MSM_DCVS) += msm_dcvs_scm.o msm_dcvs.o msm_mpdecision.o
		obj-$(CONFIG_MSM_RUN_QUEUE_STATS) += msm_rq_stats.o
		obj-$(CONFIG_MSM_SHOW_RESUME_IRQ) += msm_show_resume_irq.o
		obj-$(CONFIG_BT_MSM_PINTEST) += btpintest.o
		obj-$(CONFIG_MSM_FAKE_BATTERY) += fish_battery.o
		obj-$(CONFIG_MSM_RPC_VIBRATOR) += msm_vibrator.o
		obj-$(CONFIG_MSM_NATIVE_RESTART) += restart.o
		obj-$(CONFIG_MSM_MODEM_RESTART) += restart_7k.o

		obj-$(CONFIG_MSM_PROC_COMM_REGULATOR) += proccomm-regulator.o
		ifdef CONFIG_MSM_PROC_COMM_REGULATOR
		obj-$(CONFIG_MACH_MSM7X27_SURF) += board-msm7627-regulator.o
		obj-$(CONFIG_MACH_MSM7X27_FFA) += board-msm7627-regulator.o
		obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30-regulator.o
		obj-$(CONFIG_ARCH_MSM7X27A) += board-msm7x27a-regulator.o
		endif

		obj-$(CONFIG_EXTERNAL_MDM) += mdm2.o mdm_common.o
		obj-$(CONFIG_MSM_RTB) += msm_rtb.o
		@@ -396,32 +204,24 @@ obj-$(CONFIG_MSM_HSIC_SYSMON_TEST) += hsic_sysmon_test.o

		obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd.o
		obj-$(CONFIG_MSM_CPR) += msm_cpr.o
		obj-$(CONFIG_MSM_VP_REGULATOR) += msm_vp.o
		obj-$(CONFIG_MSM_RPC_PMIC) += pmic.o
		obj-$(CONFIG_MSM_RPC_USB) += rpc_hsusb.o rpc_fsusb.o
		obj-$(CONFIG_MSM_RPC_PMAPP) += rpc_pmapp.o

		obj-$(CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL) += wdog_debug.o

		obj-$(CONFIG_MSM_USE_USER_ACCESSIBLE_TIMERS) += timer_page.o

		ifdef CONFIG_MSM_CPR
		obj-$(CONFIG_DEBUG_FS) += msm_cpr-debug.o
		endif
		obj-$(CONFIG_MSM_FIQ) += msm7k_fiq.o
		obj-$(CONFIG_MSM_FIQ) += msm7k_fiq_handler.o

		obj-$(CONFIG_MEMORY_HOLE_CARVEOUT) += msm_mem_hole.o

		obj-$(CONFIG_MSM_SMCMOD) += smcmod.o
		obj-$(CONFIG_MSM_CPU_PWRCTL) += msm_cpu_pwrctl.o

		obj-$(CONFIG_ARCH_MSM8974) += msm_mpmctr.o
		obj-$(CONFIG_MSM_CPR_REGULATOR) += cpr-regulator.o
		obj-$(CONFIG_CPU_FREQ_MSM) += cpufreq.o

		obj-$(CONFIG_WALL_CLK) += wallclk.o
		obj-$(CONFIG_WALL_CLK_SYSFS) += wallclk_sysfs.o

		obj-$(CONFIG_ARCH_RANDOM) += early_random.o
		obj-$(CONFIG_PERFMAP) += perfmap.o

arch/arm/mach-msm/Makefile.boot

+0 −58

Original line number	Diff line number	Diff line
		# MSM7x01A
		zreladdr-$(CONFIG_ARCH_MSM7X01A) := 0x10008000
		params_phys-$(CONFIG_ARCH_MSM7X01A) := 0x10000100
		initrd_phys-$(CONFIG_ARCH_MSM7X01A) := 0x10800000

		# MSM7x25
		zreladdr-$(CONFIG_ARCH_MSM7X25) := 0x00208000
		params_phys-$(CONFIG_ARCH_MSM7X25) := 0x00200100
		initrd_phys-$(CONFIG_ARCH_MSM7X25) := 0x0A000000

		# MSM7x27
		zreladdr-$(CONFIG_ARCH_MSM7X27) := 0x00208000
		params_phys-$(CONFIG_ARCH_MSM7X27) := 0x00200100
		initrd_phys-$(CONFIG_ARCH_MSM7X27) := 0x0A000000

		# MSM7x27A
		zreladdr-$(CONFIG_ARCH_MSM7X27A) := 0x00208000
		params_phys-$(CONFIG_ARCH_MSM7X27A) := 0x00200100

		# MSM8625
		zreladdr-$(CONFIG_ARCH_MSM8625) := 0x00208000
		params_phys-$(CONFIG_ARCH_MSM8625) := 0x00200100

		# MSM7x30
		zreladdr-$(CONFIG_ARCH_MSM7X30) := 0x00208000
		params_phys-$(CONFIG_ARCH_MSM7X30) := 0x00200100
		initrd_phys-$(CONFIG_ARCH_MSM7X30) := 0x01200000

		ifeq ($(CONFIG_MSM_SOC_REV_A),y)
		# QSD8x50
		zreladdr-$(CONFIG_ARCH_QSD8X50) := 0x20008000
		params_phys-$(CONFIG_ARCH_QSD8X50) := 0x20000100
		initrd_phys-$(CONFIG_ARCH_QSD8X50) := 0x24000000
		endif

		# MSM8x60
		zreladdr-$(CONFIG_ARCH_MSM8X60) := 0x40208000

		# MSM8960
		zreladdr-$(CONFIG_ARCH_MSM8960) := 0x80208000

		# MSM8930
		zreladdr-$(CONFIG_ARCH_MSM8930) := 0x80208000

		# APQ8064
		zreladdr-$(CONFIG_ARCH_APQ8064) := 0x80208000

		# MSM8974
		zreladdr-$(CONFIG_ARCH_MSM8974) := 0x00008000

		@@ -54,20 +7,9 @@ endif
		# MSMKRYPTON
		zreladdr-$(CONFIG_ARCH_MSMKRYPTON) := 0x00008000

		# MSM9615
		zreladdr-$(CONFIG_ARCH_MSM9615) := 0x40808000

		# MSM9625
		zreladdr-$(CONFIG_ARCH_MSM9625) := 0x00308000

		# MSM8226
		zreladdr-$(CONFIG_ARCH_MSM8226) := 0x00008000

		# FSM9XXX
		zreladdr-$(CONFIG_ARCH_FSM9XXX) := 0x10008000
		params_phys-$(CONFIG_ARCH_FSM9XXX) := 0x10000100
		initrd_phys-$(CONFIG_ARCH_FSM9XXX) := 0x12000000

		# FSM9900
		zreladdr-$(CONFIG_ARCH_FSM9900) := 0x40008000

arch/arm/mach-msm/msm_bus/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -7,13 +7,7 @@ obj-$(CONFIG_CORESIGHT) += msm_buspm_coresight.o
		obj-$(CONFIG_OF) += msm_bus_of.o
		obj-$(CONFIG_MSM_RPM) += msm_bus_rpm.o
		obj-$(CONFIG_MSM_RPM_SMD) += msm_bus_rpm_smd.o
		obj-$(CONFIG_ARCH_MSM8X60) += msm_bus_board_8660.o
		obj-$(CONFIG_ARCH_MSM8960) += msm_bus_board_8960.o
		obj-$(CONFIG_ARCH_MSM9615) += msm_bus_board_9615.o
		obj-$(CONFIG_ARCH_APQ8064) += msm_bus_board_8064.o
		obj-$(CONFIG_ARCH_MSM8930) += msm_bus_board_8930.o
		obj-$(CONFIG_ARCH_MSM8974) += msm_bus_board_8974.o
		obj-$(CONFIG_ARCH_MSM9625) += msm_bus_board_9625.o
		obj-$(CONFIG_ARCH_MSM8226) += msm_bus_id.o
		obj-$(CONFIG_ARCH_MSM8610) += msm_bus_id.o
		obj-$(CONFIG_ARCH_APQ8084) += msm_bus_id.o

arch/arm/mach-msm/qdsp6v2/Makefile

+0 −23

Original line number	Diff line number	Diff line
		ifdef CONFIG_ARCH_MSM8X60
		obj-y += audio_dev_ctl.o
		obj-y += board-msm8x60-audio.o
		obj-$(CONFIG_TIMPANI_CODEC) += snddev_icodec.o
		obj-y += snddev_ecodec.o snddev_mi2s.o snddev_virtual.o
		obj-y += pcm_out.o pcm_in.o fm.o
		obj-y += audio_lpa.o
		obj-y += q6voice.o
		obj-y += snddev_hdmi.o
		obj-y += audio_mvs.o
		obj-$(CONFIG_ARCH_MSM8X60) += pcm_in_proxy.o
		obj-$(CONFIG_FB_MSM_HDMI_MSM_PANEL) += lpa_if_hdmi.o
		endif
		obj-$(CONFIG_MSM_QDSP6_APR) += apr.o apr_v1.o apr_tal.o q6core.o dsp_debug.o
		obj-$(CONFIG_MSM_QDSP6_APRV2) += apr.o apr_v2.o apr_tal.o dsp_debug.o
		ifdef CONFIG_ARCH_MSM9615
		obj-y += audio_acdb.o
		obj-y += rtac.o
		endif
		obj-$(CONFIG_MSM_QDSP6_CODECS) += aac_in.o qcelp_in.o evrc_in.o amrnb_in.o audio_utils.o
		obj-$(CONFIG_MSM_QDSP6_CODECS) += audio_wma.o audio_wmapro.o audio_aac.o audio_multi_aac.o audio_utils_aio.o
		obj-$(CONFIG_MSM_QDSP6_CODECS) += audio_acdb.o rtac.o q6audio_v1.o q6audio_v1_aio.o
		obj-$(CONFIG_MSM_QDSP6_CODECS) += audio_mp3.o audio_amrnb.o audio_amrwb.o audio_amrwbplus.o audio_evrc.o audio_qcelp.o amrwb_in.o
		obj-$(CONFIG_MSM_QDSP6V2_CODECS) += aac_in.o qcelp_in.o evrc_in.o amrnb_in.o audio_utils.o
		obj-$(CONFIG_MSM_QDSP6V2_CODECS) += audio_wma.o audio_wmapro.o audio_aac.o audio_multi_aac.o audio_utils_aio.o
		obj-$(CONFIG_MSM_QDSP6V2_CODECS) += q6audio_v2.o q6audio_v2_aio.o msm_audio_ion.o
		obj-$(CONFIG_MSM_QDSP6V2_CODECS) += audio_mp3.o audio_amrnb.o audio_amrwb.o audio_amrwbplus.o audio_evrc.o audio_qcelp.o amrwb_in.o
		obj-$(CONFIG_MSM_ADSP_LOADER) += adsp-loader.o
		obj-$(CONFIG_MSM_ULTRASOUND_A) += ultrasound/
		obj-$(CONFIG_MSM_ULTRASOUND_B) += ultrasound/

arch/arm/mach-msm/qdsp6v2/ultrasound/Makefile

+0 −1

Original line number	Diff line number	Diff line
		ccflags-y := -I$(src)/..
		obj-$(CONFIG_MSM_ULTRASOUND_A) += usf.o usfcdev.o q6usm_a.o
		obj-$(CONFIG_MSM_ULTRASOUND_B) += usf.o usfcdev.o q6usm_b.o