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

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

Merge "defconfig: apq8084: Enable SATA support for APQ8084"

parents f814f789 4456e142

arch/arm/configs/apq8084-perf_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ CONFIG_QSEECOM=y 
CONFIG_QPNP_MISC=y

CONFIG_TI_DRV2667=y

CONFIG_APQ8084_DOCKING_STATION=y

CONFIG_SCSI=y

CONFIG_SCSI_TGT=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -260,6 +259,8 @@ CONFIG_SCSI_UFSHCD=y 
CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_MSM=y

CONFIG_SCSI_UFS_TEST=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_MSM=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y
@@ -534,6 +535,7 @@ CONFIG_IOMMU_PGTABLES_L2=y 
CONFIG_IOMMU_LPAE=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_PHY_MSM_SATA=y

CONFIG_MSM_SMEM=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

arch/arm/configs/apq8084_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ CONFIG_QSEECOM=y 
CONFIG_QPNP_MISC=y

CONFIG_TI_DRV2667=y

CONFIG_APQ8084_DOCKING_STATION=y

CONFIG_SCSI=y

CONFIG_SCSI_TGT=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -261,6 +260,8 @@ CONFIG_SCSI_UFSHCD=y 
CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_MSM=y

CONFIG_SCSI_UFS_TEST=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_MSM=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y
@@ -547,6 +548,7 @@ CONFIG_CORESIGHT_ETM_PCSAVE_DEFAULT_ENABLE=y 
CONFIG_CORESIGHT_AUDIO_ETM=y

CONFIG_CORESIGHT_RPM_ETM=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_PHY_MSM_SATA=y

CONFIG_MSM_SMEM=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y