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

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

Merge "defconfig: arm: msm: Enable SYSMON communication interface"

parents 541e2fbe 04caeef9

arch/arm/configs/msm8937-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -515,8 +515,8 @@ CONFIG_MSM_L2_SPM=y 
CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

arch/arm/configs/msm8937_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -523,10 +523,10 @@ CONFIG_MSM_QMI_INTERFACE=y 
CONFIG_MSM_DCC=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

arch/arm64/configs/msm8937-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -531,8 +531,8 @@ CONFIG_MSM_L2_SPM=y 
CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

arch/arm64/configs/msm8937_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -537,10 +537,10 @@ CONFIG_MSM_QMI_INTERFACE=y 
CONFIG_MSM_DCC=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

drivers/soc/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -592,6 +592,14 @@ config MSM_SUBSYSTEM_RESTART 
	  It also notifies userspace of transitions between these states via

	  sysfs.



config MSM_SYSMON_COMM

	bool "MSM System Monitor communication support"

	depends on MSM_SMD && MSM_SUBSYSTEM_RESTART

	help

	  This option adds support for MSM System Monitor library, which

	  provides an API that may be used for notifying subsystems within

	  the SoC about other subsystems' power-up/down state-changes.



config MSM_PIL

	bool "Peripheral image loading"

	select FW_LOADER