diff options
| author | Joonwoo Park <joonwoop@codeaurora.org> | 2016-02-11 12:17:34 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:02:46 -0700 |
| commit | d794be8975c9bc4302170d73a25a319a358ecea5 (patch) | |
| tree | ca26c585de17167ee4de6a1aef3df814745e97da | |
| parent | 1770a392ab5c98667efa56dcafb0aaaff5fd48d6 (diff) | |
defconfig: msm: clean up msm_defconfig and msm-perf_defconfig
Clean up msm_defconfig and msm-perf_defconfig with 'make savedefconfig'.
Change-Id: I118d9d4ddc1fb89b4301cb7ceffdbccc60699329
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
| -rw-r--r-- | arch/arm64/configs/msm-perf_defconfig | 19 | ||||
| -rw-r--r-- | arch/arm64/configs/msm_defconfig | 7 |
2 files changed, 12 insertions, 14 deletions
diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig index 492073402c66..62306f8b6027 100644 --- a/arch/arm64/configs/msm-perf_defconfig +++ b/arch/arm64/configs/msm-perf_defconfig @@ -103,9 +103,9 @@ CONFIG_SKY2=y CONFIG_SMC91X=y CONFIG_SMSC911X=y CONFIG_WCNSS_MEM_PRE_ALLOC=y -CONFIG_CLD_LL_CORE=y CONFIG_ATH_CARDS=y CONFIG_WIL6210=m +CONFIG_CLD_LL_CORE=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y # CONFIG_SERIO_SERPORT is not set @@ -152,10 +152,11 @@ CONFIG_QPNP_FG=y CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_SENSORS_EPM_ADC=y -CONFIG_MFD_SPMI_PMIC=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_THERMAL=y +CONFIG_THERMAL_TSENS8974=y CONFIG_THERMAL_QPNP_ADC_TM=y +CONFIG_MFD_SPMI_PMIC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_RPM_SMD=y @@ -218,6 +219,10 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_CPU=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_QPNP=y +CONFIG_ESOC=y +CONFIG_ESOC_DEV=y +CONFIG_ESOC_CLIENT=y +CONFIG_ESOC_MDM_4x=y CONFIG_DMADEVICES=y CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_SPS_DMA=y @@ -234,20 +239,16 @@ CONFIG_ION=y CONFIG_ION_MSM=y CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y -CONFIG_QPNP_HAPTIC=y -CONFIG_ESOC=y -CONFIG_ESOC_DEV=y -CONFIG_ESOC_CLIENT=y -CONFIG_ESOC_MDM_4x=y CONFIG_SPS=y CONFIG_SPS_SUPPORT_NDP_BAM=y -CONFIG_SEEMP_CORE=y CONFIG_GPIO_USB_DETECT=y +CONFIG_SEEMP_CORE=y CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_ARM_SMMU=y CONFIG_IOMMU_DEBUG=y CONFIG_IOMMU_TESTS=y CONFIG_MSM_SMEM=y +CONFIG_QPNP_HAPTIC=y CONFIG_MSM_SMD=y CONFIG_MSM_GLINK=y CONFIG_MSM_GLINK_LOOPBACK_SERVER=y @@ -318,5 +319,3 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_CRC32_ARM64=y CONFIG_QMI_ENCDEC=y -CONFIG_THERMAL=y -CONFIG_THERMAL_TSENS8974=y diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig index c8b11d251fc7..e864b96f5fe6 100644 --- a/arch/arm64/configs/msm_defconfig +++ b/arch/arm64/configs/msm_defconfig @@ -102,10 +102,10 @@ CONFIG_VIRTIO_NET=y CONFIG_SKY2=y CONFIG_SMSC911X=y CONFIG_WCNSS_MEM_PRE_ALLOC=y -CONFIG_CLD_LL_CORE=y -CONFIG_QPNP_POWER_ON=y CONFIG_ATH_CARDS=y CONFIG_WIL6210=m +CONFIG_CLD_LL_CORE=y +CONFIG_QPNP_POWER_ON=y CONFIG_INPUT_EVDEV=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y @@ -241,8 +241,8 @@ CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y CONFIG_SPS=y CONFIG_SPS_SUPPORT_NDP_BAM=y -CONFIG_SEEMP_CORE=y CONFIG_GPIO_USB_DETECT=y +CONFIG_SEEMP_CORE=y CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_ARM_SMMU=y CONFIG_IOMMU_DEBUG=y @@ -309,7 +309,6 @@ CONFIG_LOCKUP_DETECTOR=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_SPINLOCK_PANIC_ON_BUG=y CONFIG_IPC_LOGGING=y CONFIG_QCOM_RTB=y CONFIG_QCOM_RTB_SEPARATE_CPUS=y |