diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-12-27 06:01:21 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2015-12-27 06:01:21 +0000 |
| commit | ac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a (patch) | |
| tree | 9d1e0c9ccf0fea88ca108d308e85394b04934d88 /config-arm64 | |
| parent | 839487c4cadf84e2c2fdfedff8a5f763102d2335 (diff) | |
| download | kernel-ac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a.tar.gz kernel-ac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a.tar.xz kernel-ac6e024f6a1cf5cd7b17e022a932c8746d8f3d3a.zip | |
Minor ARMv7/aarch64/ppc/s390 config cleanups (no other functioal changes)
Diffstat (limited to 'config-arm64')
| -rw-r--r-- | config-arm64 | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/config-arm64 b/config-arm64 index bf9c15ff8..e2b9aad11 100644 --- a/config-arm64 +++ b/config-arm64 @@ -10,19 +10,19 @@ CONFIG_SCHED_SMT=y CONFIG_ARCH_HISI=y CONFIG_ARCH_SEATTLE=y CONFIG_ARCH_XGENE=y -# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_EXYNOS7 is not set # CONFIG_ARCH_FSL_LS2085A is not set +# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MEDIATEK is not set -# CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_QCOM is not set -# CONFIG_ARCH_SPRD is not set -# CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_BCM_IPROC is not set -# CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_ROCKCHIP is not set -# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_SPRD is not set # CONFIG_ARCH_STRATIX10 is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_ZYNQMP is not set # Erratum CONFIG_ARM64_ERRATUM_826319=y @@ -64,7 +64,7 @@ CONFIG_HVC_DRIVER=y CONFIG_HZ=100 CONFIG_KVM=y -CONFIG_KVM_ARM_MAX_VCPUS=8 +CONFIG_KVM_ARM_MAX_VCPUS=16 CONFIG_RCU_FANOUT=64 CONFIG_SPARSE_IRQ=y @@ -96,6 +96,8 @@ CONFIG_PCC=y CONFIG_ACPI_CPPC_CPUFREQ=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_THERMAL=y +CONFIG_I2C_SCMI=m +CONFIG_SENSORS_ACPI_POWER=m CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM64_CE=y @@ -113,7 +115,6 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m # APM Xgene CONFIG_POWER_RESET_XGENE=y CONFIG_COMMON_CLK_XGENE=y - CONFIG_AHCI_XGENE=y CONFIG_PHY_XGENE=y CONFIG_NET_XGENE=y @@ -123,6 +124,9 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_XGENE_SB=m CONFIG_XGENE_DMA=m CONFIG_EDAC_XGENE=m +CONFIG_PCI_XGENE=y +CONFIG_PCI_XGENE_MSI=y +CONFIG_I2C_XGENE_SLIMPRO=m # busted build for various reasons # uses pci_* for some reason to allocate DMA buffers @@ -133,16 +137,11 @@ CONFIG_EDAC_XGENE=m # CONFIG_PARPORT_PC is not set # CONFIG_VGA_CONSOLE is not set -CONFIG_PCI_XGENE=y -CONFIG_PCI_XGENE_MSI=y # CONFIG_HOTPLUG_PCI_SHPC is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set # CONFIG_PNP_DEBUG_MESSAGES is not set -CONFIG_I2C_SCMI=m -CONFIG_I2C_XGENE_SLIMPRO=m -CONFIG_SENSORS_ACPI_POWER=m # AMD Seattle CONFIG_NET_SB1000=y @@ -160,11 +159,6 @@ CONFIG_PCI_HISI=y # ThunderX # CONFIG_MDIO_OCTEON is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_EN_VXLAN=y - # CONFIG_IMX_THERMAL is not set CONFIG_DMI=y |