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

Commit 3b25b50f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable qcom_scm as a module"

parents 1ba0f31f 1699be26

arch/arm64/configs/vendor/lahaina_GKI.config

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ CONFIG_MSM_CORE_HANG_DETECT=m 
CONFIG_QCOM_LLCC=m

CONFIG_QCOM_LAHAINA_LLCC=m

CONFIG_QCOM_IPCC=m

CONFIG_QCOM_SCM=m

CONFIG_QTEE_SHM_BRIDGE=y

# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set

CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y

CONFIG_HWSPINLOCK_QCOM=m

CONFIG_QCOM_SMEM=m

arch/arm64/configs/vendor/lahaina_QGKI.config

+0 −3
Original line number Diff line number Diff line
@@ -27,6 +27,3 @@ CONFIG_MSM_GLOBAL_SYNX=y 
CONFIG_MSM_CVP=y

CONFIG_ION_POOL_AUTO_REFILL=y

CONFIG_MSM_BT_POWER=m
 
CONFIG_QCOM_SCM=y

# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set

CONFIG_QTEE_SHM_BRIDGE=y

drivers/firmware/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ config INTEL_STRATIX10_RSU 
	  Say Y here if you want Intel RSU support.



config QCOM_SCM

	bool "Qualcomm Technologies, Inc. SCM Interface"

	tristate "Qualcomm Technologies, Inc. SCM Interface"

	depends on ARM || ARM64

	select RESET_CONTROLLER

	help

drivers/firmware/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o 
obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o

obj-$(CONFIG_FW_CFG_SYSFS)	+= qemu_fw_cfg.o

obj-$(CONFIG_QCOM_SCM)		+= _qcom_scm.o

_qcom_scm-y			+= qcom_scm.o qcom_scm-smc.o

_qcom_scm-y			+= qcom_scm.o qcom_scm-smc.o qcom_smc.o

_qcom_scm-$(CONFIG_QTEE_SHM_BRIDGE)	+= qtee_shmbridge.o

obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o

obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o

drivers/firmware/qcom_scm-smc.c

+767 −3

File changed.

Preview size limit exceeded, changes collapsed.