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

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

Merge "msm: bam_dmux: Support multiplatform"

parents b3df9369 c35d83c2

arch/arm/configs/msm8226-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_ARCH_MSM8226=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y
@@ -418,6 +417,7 @@ CONFIG_PWM=y 
CONFIG_PWM_QPNP=y

CONFIG_MOBICORE_SUPPORT=m

CONFIG_MOBICORE_API=m

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_SMEM_LOGGING=y

CONFIG_EXT2_FS=y

arch/arm/configs/msm8226_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_ARCH_MSM8226=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y
@@ -433,6 +432,7 @@ CONFIG_CORESIGHT_MODEM_ETM=y 
CONFIG_CORESIGHT_WCN_ETM=y

CONFIG_CORESIGHT_RPM_ETM=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_SMEM_LOGGING=y

CONFIG_EXT2_FS=y

arch/arm/configs/msm8610-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ CONFIG_ARCH_MSM8610=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y
@@ -377,6 +376,7 @@ CONFIG_MSM_IOMMU_V0=y 
CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_SENSORS=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_SMEM_LOGGING=y

CONFIG_EXT2_FS=y

arch/arm/configs/msm8610_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_ARCH_MSM8610=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y
@@ -386,6 +385,7 @@ CONFIG_CORESIGHT_WCN_ETM=y 
CONFIG_CORESIGHT_RPM_ETM=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_SENSORS=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_SMEM_LOGGING=y

CONFIG_EXT2_FS=y

arch/arm/configs/msm8974-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y
@@ -458,6 +457,7 @@ CONFIG_MOBICORE_SUPPORT=m 
CONFIG_MOBICORE_API=m

CONFIG_BIF=y

CONFIG_BIF_QPNP=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_SMEM_LOGGING=y

CONFIG_EXT2_FS=y