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

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

Merge "defconfig: fsm9900: Enable qseecom ion and cma drivers"

parents 305399d0 ea956bfd

arch/arm/configs/fsm9900-perf_defconfig

+11 −8
Original line number Diff line number Diff line
@@ -42,12 +42,7 @@ CONFIG_MSM_MPM_OF=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_PCIE=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y

CONFIG_MSM_DIRECT_SCLK_ACCESS=y

CONFIG_MSM_WATCHDOG_V2=y

CONFIG_MSM_MEMORY_DUMP=y

CONFIG_MSM_DLOAD_MODE=y

CONFIG_MSM_SPM_V2=y

CONFIG_MSM_L2_SPM=y
@@ -55,7 +50,6 @@ CONFIG_MSM_OCMEM=y 
CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_NONSECURE=y

CONFIG_SENSORS_SSC=y

CONFIG_MSM_CACHE_ERP=y

CONFIG_MSM_L1_ERR_PANIC=y

CONFIG_MSM_L1_RECOV_ERR_PANIC=y
@@ -136,8 +130,11 @@ CONFIG_BRIDGE=y 
CONFIG_VLAN_8021Q=y

CONFIG_IPC_ROUTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CMA=y

CONFIG_CMA_DEBUG=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_QFP_FUSE=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y
@@ -228,13 +225,13 @@ CONFIG_MMC_SDHCI_MSM=y 
CONFIG_SWITCH=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_ION=y

CONFIG_ION_TEST=y

CONFIG_ION_MSM=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_POWER_ON=y
@@ -242,11 +239,17 @@ CONFIG_QPNP_CLKDIV=y 
CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_SENSORS_SSC=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_SMD=y

CONFIG_MSM_SMD_DEBUG=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_SMEM_LOGGING=y

CONFIG_MSM_MEMORY_DUMP=y

CONFIG_MSM_WATCHDOG_V2=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

arch/arm/configs/fsm9900_defconfig

+11 −8
Original line number Diff line number Diff line
@@ -41,12 +41,7 @@ CONFIG_MSM_MPM_OF=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_PCIE=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y

CONFIG_MSM_DIRECT_SCLK_ACCESS=y

CONFIG_MSM_WATCHDOG_V2=y

CONFIG_MSM_MEMORY_DUMP=y

CONFIG_MSM_DLOAD_MODE=y

CONFIG_MSM_SPM_V2=y

CONFIG_MSM_L2_SPM=y
@@ -54,7 +49,6 @@ CONFIG_MSM_OCMEM=y 
CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_NONSECURE=y

CONFIG_SENSORS_SSC=y

CONFIG_MSM_CACHE_ERP=y

CONFIG_MSM_L1_ERR_PANIC=y

CONFIG_MSM_L1_RECOV_ERR_PANIC=y
@@ -137,8 +131,11 @@ CONFIG_BRIDGE=y 
CONFIG_VLAN_8021Q=y

CONFIG_IPC_ROUTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CMA=y

CONFIG_CMA_DEBUG=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_QFP_FUSE=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y
@@ -228,13 +225,13 @@ CONFIG_MMC_SDHCI_MSM=y 
CONFIG_SWITCH=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_ION=y

CONFIG_ION_TEST=y

CONFIG_ION_MSM=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_POWER_ON=y
@@ -242,11 +239,17 @@ CONFIG_QPNP_CLKDIV=y 
CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_SENSORS_SSC=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_SMD=y

CONFIG_MSM_SMD_DEBUG=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_SMEM_LOGGING=y

CONFIG_MSM_MEMORY_DUMP=y

CONFIG_MSM_WATCHDOG_V2=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y