defconfig: msmcortex: Keep NR_CPUS to 16

Keep NR_CPUSs restricted to 16 compared to 64, since
some of the schedular tracer code has compile time
checks for NR_CPUS > 32.

Other options update in this defconfig is based on the
auto-update.

Change-Id: I91e28714e3ee79a06eb5994ad8fc14f0b58a1e43
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>

3 files changed, 11 insertions, 28 deletions

diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig
index 45afe84d5ff2..911c263dfe7f 100644
--- a/arch/arm64/configs/msm_defconfig
+++ b/arch/arm64/configs/msm_defconfig
@@ -295,7 +295,6 @@ CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_DIAG_CHAR=y
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_I2C=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MSM_LEGACY=y
 CONFIG_MSM_ADSPRPC=y
@@ -305,15 +304,6 @@ CONFIG_I2C_MSM_V2=y
 CONFIG_SLIMBUS=y
 CONFIG_SLIMBUS_MSM_NGD=y
 CONFIG_SOUNDWIRE=y
-CONFIG_WCD9335_CODEC=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_USB_AUDIO=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_COMPRESS=y
-CONFIG_SND_SOC_MSM8996=y
-CONFIG_MSM_AVTIMER=y
-CONFIG_SWITCH=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_QUP=y
@@ -341,6 +331,7 @@ CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
 CONFIG_THERMAL_TSENS8974=y
 CONFIG_THERMAL_QPNP_ADC_TM=y
 CONFIG_MFD_SPMI_PMIC=y
+CONFIG_WCD9335_CODEC=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_RPM_SMD=y
@@ -352,15 +343,14 @@ CONFIG_REGULATOR_CPR3_MMSS=y
 CONFIG_REGULATOR_KRYO=y
 CONFIG_REGULATOR_MEM_ACC=y
 CONFIG_REGULATOR_PROXY_CONSUMER=y
-CONFIG_QCOM_KGSL=y
-CONFIG_SOC_CAMERA=y
-CONFIG_SOC_CAMERA_PLATFORM=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_ADV_DEBUG=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_SOC_CAMERA_PLATFORM=y
 CONFIG_MSM_CAMERA=y
 CONFIG_MSM_CAMERA_DEBUG=y
 CONFIG_MSMB_CAMERA=y
@@ -393,6 +383,7 @@ CONFIG_MSM_JPEGDMA=y
 CONFIG_MSM_VIDC_V4L2=y
 CONFIG_MSM_VIDC_VMEM=y
 CONFIG_MSM_VIDC_GOVERNORS=y
+CONFIG_QCOM_KGSL=y
 CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_MSM=y
@@ -456,8 +447,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_EXYNOS=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_QPNP=y
 CONFIG_LEDS_QPNP_FLASH=y
 CONFIG_LEDS_QPNP_WLED=y
@@ -482,8 +471,6 @@ CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_STAGING=y
-CONFIG_SYNC=y
-CONFIG_SW_SYNC=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
@@ -504,11 +491,6 @@ CONFIG_MSM_MHI=y
 CONFIG_MSM_MHI_UCI=y
 CONFIG_MSM_MHI_DEBUG=y
 CONFIG_SEEMP_CORE=y
-CONFIG_MSM_MDSS_PLL=y
-CONFIG_REMOTE_SPINLOCK_MSM=y
-CONFIG_ARM_SMMU=y
-CONFIG_IOMMU_DEBUG=y
-CONFIG_IOMMU_TESTS=y
 CONFIG_USB_BAM=y
 CONFIG_MSM_SMEM=y
 CONFIG_QPNP_HAPTIC=y
@@ -547,6 +529,11 @@ CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_QCOM_REMOTEQDSS=y
 CONFIG_MEM_SHARE_QMI_SERVICE=y
+CONFIG_MSM_MDSS_PLL=y
+CONFIG_REMOTE_SPINLOCK_MSM=y
+CONFIG_ARM_SMMU=y
+CONFIG_IOMMU_DEBUG=y
+CONFIG_IOMMU_TESTS=y
 CONFIG_MSM_BIMC_BWMON=y
 CONFIG_ARM_MEMLAT_MON=y
 CONFIG_MSM_M4M_HWMON=y
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 11dcc80c0e23..8adae38ccb64 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -44,6 +44,7 @@ CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_SCHED_MC=y
+CONFIG_NR_CPUS=16
 CONFIG_PREEMPT=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -157,7 +158,6 @@ CONFIG_REGULATOR_STUB=y
 CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_LOGO=y
-CONFIG_DIAG_CHAR=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_UHID=y
@@ -222,8 +222,6 @@ CONFIG_ION_MSM=y
 CONFIG_QPNP_REVID=y
 CONFIG_QPNP_COINCELL=y
 CONFIG_GPIO_USB_DETECT=y
-CONFIG_REMOTE_SPINLOCK_MSM=y
-CONFIG_ARM_SMMU=y
 CONFIG_MSM_SMEM=y
 CONFIG_QPNP_HAPTIC=y
 CONFIG_MSM_SMD=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index 9dee9861c775..f9a0df9ac808 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -44,6 +44,7 @@ CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_SCHED_MC=y
+CONFIG_NR_CPUS=16
 CONFIG_PREEMPT=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -174,7 +175,6 @@ CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_VIRTUAL=y
 CONFIG_LOGO=y
-CONFIG_DIAG_CHAR=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_UHID=y
@@ -245,8 +245,6 @@ CONFIG_ION_MSM=y
 CONFIG_QPNP_REVID=y
 CONFIG_QPNP_COINCELL=y
 CONFIG_GPIO_USB_DETECT=y
-CONFIG_REMOTE_SPINLOCK_MSM=y
-CONFIG_ARM_SMMU=y
 CONFIG_MSM_SMEM=y
 CONFIG_QPNP_HAPTIC=y
 CONFIG_MSM_SMD=y