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

Commit ea94b1ec 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 MSM_TZ_SMMU for msmtitanium"

parents 0fc88f83 ee44b62c

arch/arm/configs/msmcortex-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -519,6 +519,7 @@ CONFIG_MSM_QMI_INTERFACE=y 
CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_TZ_SMMU=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

arch/arm/configs/msmcortex_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -525,6 +525,7 @@ CONFIG_MSM_EVENT_TIMER=y 
CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_TZ_SMMU=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -535,6 +535,7 @@ CONFIG_MSM_DCC=y 
CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_TZ_SMMU=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -549,6 +549,7 @@ CONFIG_MSM_EVENT_TIMER=y 
CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_SYSMON_GLINK_COMM=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_GLINK_PKT=y

CONFIG_MSM_TZ_SMMU=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

drivers/soc/qcom/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -593,7 +593,7 @@ config MSM_GLINK_PKT 




config MSM_TZ_SMMU

config MSM_TZ_SMMU

	bool "Helper functions for SMMU configuration through TZ"

	bool "Helper functions for SMMU configuration through TZ"

	depends on ARCH_MSMTHULIUM

	depends on ARCH_MSMTHULIUM || ARCH_MSMTITANIUM

	help

	help

	  Say 'Y' here for targets that need to call into TZ to configure

	  Say 'Y' here for targets that need to call into TZ to configure

	  SMMUs for any reason (for example, for errata workarounds or

	  SMMUs for any reason (for example, for errata workarounds or