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

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

Merge "msm: ipc: Support multi-platform"

parents 261b83b1 ab9df051

arch/arm/configs/apq8084-perf_defconfig

+5 −4
Original line number Diff line number Diff line
@@ -44,10 +44,7 @@ CONFIG_MSM_SMD=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_HSIC_XPRT=y

CONFIG_MSM_IPC_ROUTER_SECURITY=y

CONFIG_EXTERNAL_MDM=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y
@@ -64,6 +61,8 @@ CONFIG_MSM_DLOAD_MODE=y 
CONFIG_MSM_JTAG=y

CONFIG_MSM_RUN_QUEUE_STATS=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_HSIC_XPRT=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y
@@ -240,6 +239,8 @@ CONFIG_CFG80211=y 
CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_RFKILL=y

CONFIG_NFC_QNCI=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_CMA=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

arch/arm/configs/apq8084_defconfig

+5 −4
Original line number Diff line number Diff line
@@ -43,10 +43,7 @@ CONFIG_MSM_SMD=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_HSIC_XPRT=y

CONFIG_MSM_IPC_ROUTER_SECURITY=y

CONFIG_EXTERNAL_MDM=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y
@@ -62,6 +59,8 @@ CONFIG_MSM_MEMORY_DUMP=y 
CONFIG_MSM_DLOAD_MODE=y

CONFIG_MSM_RUN_QUEUE_STATS=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_HSIC_XPRT=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y
@@ -242,6 +241,8 @@ CONFIG_CFG80211=y 
CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_RFKILL=y

CONFIG_NFC_QNCI=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_CMA=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

arch/arm/configs/fsm9900-perf_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ CONFIG_MSM_MPM_OF=y 
CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_PCIE=y

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y
@@ -138,6 +136,7 @@ CONFIG_BRIDGE_EBT_PKTTYPE=m 
CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_IPC_ROUTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -242,6 +241,7 @@ CONFIG_REMOTE_SPINLOCK_MSM=y 
CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

arch/arm/configs/fsm9900_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ CONFIG_MSM_MPM_OF=y 
CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_PCIE=y

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y
@@ -139,6 +137,7 @@ CONFIG_BRIDGE_EBT_PKTTYPE=m 
CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_IPC_ROUTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -241,6 +240,7 @@ CONFIG_REMOTE_SPINLOCK_MSM=y 
CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

arch/arm/configs/mdm9630_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ CONFIG_MSM_SMD=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y
@@ -168,6 +166,7 @@ CONFIG_RMNET_DATA=y 
CONFIG_RMNET_DATA_DEBUG_PKT=y

CONFIG_CFG80211=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_IPC_ROUTER=y

CONFIG_CMA=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y
@@ -299,6 +298,7 @@ CONFIG_CORESIGHT_AUDIO_ETM=y 
CONFIG_CORESIGHT_MODEM_ETM=y

CONFIG_CORESIGHT_RPM_ETM=y

CONFIG_MSM_SMEM=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y