Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 468d6acd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: scm-boot: move scm-boot driver to a new location in kernel"

parents dbe3e701 404322a8

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ obj-$(CONFIG_DEBUG_FS) += perf_debug.o 
obj-$(CONFIG_SMP) += headsmp.o platsmp.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o



obj-$(CONFIG_MSM_SCM) += scm-boot.o

obj-$(CONFIG_MSM_XPU_ERR_FATAL) += scm-xpu.o

obj-$(CONFIG_MSM_TEST_QMI_CLIENT) += kernel_test_service_v01.o test_qmi_client.o

obj-y += qdsp6v2/

drivers/soc/qcom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ obj-$(CONFIG_MSM_JTAG) += jtag-fuse.o jtag.o 
obj-$(CONFIG_MSM_JTAG_MM) +=  jtag-fuse.o jtag-mm.o

obj-$(CONFIG_MSM_QMI_INTERFACE) += qmi_interface.o



obj-$(CONFIG_MSM_SCM) += scm.o

obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o



obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o smd_private.o smd_init_dt.o smsm_debug.o

obj-$(CONFIG_MSM_SMEM) += smem.o smem_debug.o

arch/arm/mach-msm/scm-boot.c→drivers/soc/qcom/scm-boot.c

+0 −1
Original line number Diff line number Diff line
@@ -31,4 +31,3 @@ int scm_set_boot_addr(phys_addr_t addr, unsigned int flags) 
			&cmd, sizeof(cmd), NULL, 0);

}

EXPORT_SYMBOL(scm_set_boot_addr);