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

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

Merge "defconfig: msm: Enable USB,charger,EMMC and SELinux for msm8909w"

parents 15821464 f67da12c

arch/arm/configs/msm8909w-perf_defconfig

+35 −4
Original line number Diff line number Diff line 
CONFIG_AUDIT=y

# CONFIG_AUDITSYSCALL is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y
@@ -268,6 +269,7 @@ CONFIG_MSM_SMD_PKT=y 
CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MSM_V2=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y
@@ -281,8 +283,8 @@ CONFIG_POWER_RESET=y 
CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_FG_GEN3=y

CONFIG_QPNP_SMB2=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y

CONFIG_THERMAL_QPNP=y
@@ -341,6 +343,25 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FS=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CI13XXX_MSM=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ACM=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_ECM=y

CONFIG_USB_CONFIGFS_EEM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_CCID=y

CONFIG_USB_CONFIGFS_F_GSI=y

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_RING_BUFFER=y
@@ -351,6 +372,7 @@ CONFIG_MMC_BLOCK_DEFERRED_RESUME=y 
CONFIG_MMC_TEST=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y
@@ -362,6 +384,10 @@ CONFIG_ASHMEM=y 
CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_USB_BAM=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y
@@ -394,6 +420,11 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_EVENT_TIMER=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_IIO=y

CONFIG_QCOM_SPMI_IADC=y

CONFIG_QCOM_SPMI_VADC=y

CONFIG_QCOM_RRADC=y

CONFIG_PWM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y
@@ -476,12 +507,12 @@ CONFIG_CORESIGHT_EVENT=y 
CONFIG_CORESIGHT_HWEVENT=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITYFS=y

CONFIG_SECURITY_PATH=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_APPARMOR=y

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y

arch/arm/configs/msm8909w_defconfig

+35 −4
Original line number Diff line number Diff line 
CONFIG_AUDIT=y

# CONFIG_AUDITSYSCALL is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y
@@ -268,6 +269,7 @@ CONFIG_MSM_SMD_PKT=y 
CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MSM_V2=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y
@@ -281,8 +283,8 @@ CONFIG_POWER_RESET=y 
CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_FG_GEN3=y

CONFIG_QPNP_SMB2=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y

CONFIG_THERMAL_QPNP=y
@@ -341,6 +343,25 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FS=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CI13XXX_MSM=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ACM=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_ECM=y

CONFIG_USB_CONFIGFS_EEM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_CCID=y

CONFIG_USB_CONFIGFS_F_GSI=y

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_RING_BUFFER=y
@@ -351,6 +372,7 @@ CONFIG_MMC_BLOCK_DEFERRED_RESUME=y 
CONFIG_MMC_TEST=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y
@@ -362,6 +384,10 @@ CONFIG_ASHMEM=y 
CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_USB_BAM=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y
@@ -394,6 +420,11 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_EVENT_TIMER=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_IIO=y

CONFIG_QCOM_SPMI_IADC=y

CONFIG_QCOM_SPMI_VADC=y

CONFIG_QCOM_RRADC=y

CONFIG_PWM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y
@@ -476,12 +507,12 @@ CONFIG_CORESIGHT_EVENT=y 
CONFIG_CORESIGHT_HWEVENT=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITYFS=y

CONFIG_SECURITY_PATH=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_APPARMOR=y

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y