diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 15:39:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 15:39:32 -0800 |
| commit | 54fff785db6e44208478ae3b0e5c56b853b3e10d (patch) | |
| tree | c3098fcb6704418236aa455088b9ed44c258c290 /arch/arm64 | |
| parent | c35675f351b9f13062cfd0fac762615e703af2af (diff) | |
| parent | ddf5cf02b981e32aa5896cfd66fc191b9a58ed2e (diff) | |
| download | linux-54fff785db6e44208478ae3b0e5c56b853b3e10d.tar.bz2 | |
Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC defconfig updates from Arnd Bergmann:
"Defconfig additions, removals, etc. Almost all of them just turn on
drivers that we want on some platform, usually after the driver has
been merged into mainline.
There is now a new defconfig file for tango4"
* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
ARM: multi_v7_defconfig: enable pstore configs
ARM: multi_v7_defconfig: enable some newly added crypto modules
ARM: davinci_all_defconfig: enable SATA modules
arm64: defconfig: enable CONFIG_MTD_NAND and CONFIG_MTD_NAND_DENALI_DT
arm64: defconfig: enable CONFIG_MTD_BLOCK
ARM: Import tango4_defconfig
ARM: omap2plus_defconfig: Enable support for RTC M41T80
ARM: omap2plus_defconfig: Enable support for micrell phys
ARM: vf610m4: defconfig: enable EXT4 filesystem
ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
arm64: defconfig: Enable NUMA and NUMA_BALANCING
arm64: defconfig: enable SMMUv3 config
ARM: davinci_all_defconfig: enable iio
ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
ARM: configs: stm32: Add RTC support in STM32 defconfig
ARM: defconfig: qcom: add APQ8060 DragonBoard devices
ARM: qcom_defconfig: enable thermal sensors
ARM: qcom_defconfig: add ahci configs
ARM: qcom_defconfig: add pcie and atl1c ethernet configs
ARM: qcom_defconfig: add usb related configs
...
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 8752f578417c..7c48028ec64a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -11,6 +11,7 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y @@ -73,6 +74,7 @@ CONFIG_PCIE_QCOM=y CONFIG_PCIE_ARMADA_8K=y CONFIG_ARM64_VA_BITS_48=y CONFIG_SCHED_MC=y +CONFIG_NUMA=y CONFIG_PREEMPT=y CONFIG_KSM=y CONFIG_TRANSPARENT_HUGEPAGE=y @@ -144,7 +146,10 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DMA_CMA=y CONFIG_MTD=y +CONFIG_MTD_BLOCK=y CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_DENALI_DT=y CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=m @@ -444,6 +449,7 @@ CONFIG_PLATFORM_MHU=y CONFIG_BCM2835_MBOX=y CONFIG_HI6220_MBOX=y CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_V3=y CONFIG_RASPBERRYPI_POWER=y CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD=y |