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

Commit d7ea8e6d authored by Kiran Raparthy's avatar Kiran Raparthy
Browse files

Merge commit '771efa0c' into HEAD 



Change-Id: I22813af37650430dce655facceafd869c202c013
Signed-off-by: default avatarKiran Raparthy <kraparth@codeaurora.org>
parents fa0bf431 771efa0c

arch/arm64/configs/vendor/bengal-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -406,8 +406,10 @@ CONFIG_RMNET_IPA3=y 
CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QCOM_CLK_SMD_RPM=y

CONFIG_SM_GPUCC_BENGAL=y

CONFIG_SM_DISPCC_BENGAL=y

CONFIG_SM_DEBUGCC_BENGAL=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y
@@ -424,7 +426,6 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y 
CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QCOM_CPUSS_DUMP=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_QCOM_MDT_LOADER=y

CONFIG_QPNP_PBS=y

arch/arm64/configs/vendor/bengal_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ CONFIG_RMNET_IPA3=y 
CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QCOM_CLK_SMD_RPM=y

CONFIG_SM_GPUCC_BENGAL=y

CONFIG_SM_DISPCC_BENGAL=y

CONFIG_SM_DEBUGCC_BENGAL=y
@@ -443,7 +444,6 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y 
CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_QCOM_CPUSS_DUMP=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_QCOM_MDT_LOADER=y

CONFIG_QPNP_PBS=y
@@ -537,6 +537,7 @@ CONFIG_CRYPTO_DEV_QCE=y 
CONFIG_XZ_DEC=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_MODULE_LOAD_INFO=y

CONFIG_DEBUG_INFO=y

CONFIG_PAGE_OWNER=y

CONFIG_DEBUG_SECTION_MISMATCH=y

arch/arm64/configs/vendor/kona-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_HZ_100=y 
CONFIG_SECCOMP=y

CONFIG_OKL4_GUEST=y

# CONFIG_UNMAP_KERNEL_AT_EL0 is not set

CONFIG_ARM64_SSBD=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y

CONFIG_CP15_BARRIER_EMULATION=y
@@ -66,7 +67,6 @@ CONFIG_RANDOMIZE_BASE=y 
CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y

CONFIG_KRYO_PMU_WORKAROUND=y

CONFIG_COMPAT=y

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set
@@ -272,6 +272,7 @@ CONFIG_MHI_UCI=y 
CONFIG_MHI_SATELLITE=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_LOOP_MIN_COUNT=16

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_HDCP_QSEECOM=y

arch/arm64/configs/vendor/kona_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_HZ_100=y 
CONFIG_SECCOMP=y

CONFIG_OKL4_GUEST=y

# CONFIG_UNMAP_KERNEL_AT_EL0 is not set

CONFIG_ARM64_SSBD=y

CONFIG_PRINT_VMEMLAYOUT=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y
@@ -66,7 +67,6 @@ CONFIG_RANDOMIZE_BASE=y 
CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y

CONFIG_KRYO_PMU_WORKAROUND=y

CONFIG_COMPAT=y

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set
@@ -282,6 +282,7 @@ CONFIG_MHI_UCI=y 
CONFIG_MHI_SATELLITE=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_LOOP_MIN_COUNT=16

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_HDCP_QSEECOM=y
@@ -607,6 +608,7 @@ CONFIG_MSM_CORE_HANG_DETECT=y 
CONFIG_QCOM_FSA4480_I2C=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_WDOG_IPI_ENABLE=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_BUS_CONFIG_RPMH=y

CONFIG_MSM_SPCOM=y

arch/arm64/configs/vendor/lito-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -397,12 +397,16 @@ CONFIG_REGULATOR_STUB=y 
CONFIG_REGULATOR_PM8008=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_NPU=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_DVB_MPQ_SW=y

CONFIG_V4L_TEST_DRIVERS=y

CONFIG_VIDEO_VIM2M=m

CONFIG_VIDEO_VICODEC=y