aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2014-05-22 10:13:05 -0400
committerCatalin Marinas <catalin.marinas@arm.com>2014-05-22 11:07:13 -0400
commit74d2eb3cdb7bd6011229aa551bb36d45bcd327f4 (patch)
treed7e3526cabd05275c589179fc0224ca946f52f6b /arch/arm64
parentb9acc49ee9464f8f8232a790045d057eb158e869 (diff)
arm64: defconfig: enable a few more common/useful options in defconfig
Whilst our defconfig is certainly usable, there are a few extra features we can enable to make it considerably more useful, particularly if people are using it for testing: - KVM - SWAP - Hugepages - ARMv8 crypto This patch enables these options in our defconfig. Note that the ordering has changed slightly, since this is the result of a new savedefconfig make target. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/configs/defconfig36
1 files changed, 23 insertions, 13 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 7959dd0ca5d5..157e1d8d9a47 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1,11 +1,11 @@
1# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
2# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_AUDIT=y
5CONFIG_NO_HZ_IDLE=y
6CONFIG_HIGH_RES_TIMERS=y
5CONFIG_BSD_PROCESS_ACCT=y 7CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 8CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_NO_HZ=y
8CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=14 11CONFIG_LOG_BUF_SHIFT=14
@@ -27,6 +27,7 @@ CONFIG_ARCH_VEXPRESS=y
27CONFIG_ARCH_XGENE=y 27CONFIG_ARCH_XGENE=y
28CONFIG_SMP=y 28CONFIG_SMP=y
29CONFIG_PREEMPT=y 29CONFIG_PREEMPT=y
30CONFIG_TRANSPARENT_HUGEPAGE=y
30CONFIG_CMA=y 31CONFIG_CMA=y
31CONFIG_CMDLINE="console=ttyAMA0" 32CONFIG_CMDLINE="console=ttyAMA0"
32# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 33# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -44,7 +45,7 @@ CONFIG_IP_PNP_BOOTP=y
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 45CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_DEVTMPFS=y 46CONFIG_DEVTMPFS=y
46CONFIG_DMA_CMA=y 47CONFIG_DMA_CMA=y
47CONFIG_SCSI=y 48CONFIG_VIRTIO_BLK=y
48# CONFIG_SCSI_PROC_FS is not set 49# CONFIG_SCSI_PROC_FS is not set
49CONFIG_BLK_DEV_SD=y 50CONFIG_BLK_DEV_SD=y
50# CONFIG_SCSI_LOWLEVEL is not set 51# CONFIG_SCSI_LOWLEVEL is not set
@@ -56,20 +57,18 @@ CONFIG_SMC91X=y
56CONFIG_SMSC911X=y 57CONFIG_SMSC911X=y
57# CONFIG_WLAN is not set 58# CONFIG_WLAN is not set
58CONFIG_INPUT_EVDEV=y 59CONFIG_INPUT_EVDEV=y
59# CONFIG_SERIO_I8042 is not set
60# CONFIG_SERIO_SERPORT is not set 60# CONFIG_SERIO_SERPORT is not set
61CONFIG_LEGACY_PTY_COUNT=16 61CONFIG_LEGACY_PTY_COUNT=16
62CONFIG_SERIAL_8250=y 62CONFIG_SERIAL_8250=y
63CONFIG_SERIAL_8250_CONSOLE=y 63CONFIG_SERIAL_8250_CONSOLE=y
64CONFIG_SERIAL_OF_PLATFORM=y
65CONFIG_SERIAL_AMBA_PL011=y 64CONFIG_SERIAL_AMBA_PL011=y
66CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 65CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
66CONFIG_SERIAL_OF_PLATFORM=y
67# CONFIG_HW_RANDOM is not set 67# CONFIG_HW_RANDOM is not set
68# CONFIG_HWMON is not set 68# CONFIG_HWMON is not set
69CONFIG_REGULATOR=y 69CONFIG_REGULATOR=y
70CONFIG_REGULATOR_FIXED_VOLTAGE=y 70CONFIG_REGULATOR_FIXED_VOLTAGE=y
71CONFIG_FB=y 71CONFIG_FB=y
72# CONFIG_VGA_CONSOLE is not set
73CONFIG_FRAMEBUFFER_CONSOLE=y 72CONFIG_FRAMEBUFFER_CONSOLE=y
74CONFIG_LOGO=y 73CONFIG_LOGO=y
75# CONFIG_LOGO_LINUX_MONO is not set 74# CONFIG_LOGO_LINUX_MONO is not set
@@ -79,27 +78,38 @@ CONFIG_USB_ISP1760_HCD=y
79CONFIG_USB_STORAGE=y 78CONFIG_USB_STORAGE=y
80CONFIG_MMC=y 79CONFIG_MMC=y
81CONFIG_MMC_ARMMMCI=y 80CONFIG_MMC_ARMMMCI=y
81CONFIG_VIRTIO_MMIO=y
82# CONFIG_IOMMU_SUPPORT is not set 82# CONFIG_IOMMU_SUPPORT is not set
83CONFIG_EXT2_FS=y 83CONFIG_EXT2_FS=y
84CONFIG_EXT3_FS=y 84CONFIG_EXT3_FS=y
85CONFIG_EXT4_FS=y
86# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 85# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
87# CONFIG_EXT3_FS_XATTR is not set 86# CONFIG_EXT3_FS_XATTR is not set
87CONFIG_EXT4_FS=y
88CONFIG_FUSE_FS=y 88CONFIG_FUSE_FS=y
89CONFIG_CUSE=y 89CONFIG_CUSE=y
90CONFIG_VFAT_FS=y 90CONFIG_VFAT_FS=y
91CONFIG_TMPFS=y 91CONFIG_TMPFS=y
92CONFIG_HUGETLBFS=y
92# CONFIG_MISC_FILESYSTEMS is not set 93# CONFIG_MISC_FILESYSTEMS is not set
93CONFIG_NFS_FS=y 94CONFIG_NFS_FS=y
94CONFIG_ROOT_NFS=y 95CONFIG_ROOT_NFS=y
95CONFIG_NLS_CODEPAGE_437=y 96CONFIG_NLS_CODEPAGE_437=y
96CONFIG_NLS_ISO8859_1=y 97CONFIG_NLS_ISO8859_1=y
97CONFIG_MAGIC_SYSRQ=y 98CONFIG_VIRTUALIZATION=y
99CONFIG_KVM=y
100CONFIG_DEBUG_INFO=y
98CONFIG_DEBUG_FS=y 101CONFIG_DEBUG_FS=y
102CONFIG_MAGIC_SYSRQ=y
99CONFIG_DEBUG_KERNEL=y 103CONFIG_DEBUG_KERNEL=y
104CONFIG_LOCKUP_DETECTOR=y
100# CONFIG_SCHED_DEBUG is not set 105# CONFIG_SCHED_DEBUG is not set
101CONFIG_DEBUG_INFO=y
102# CONFIG_FTRACE is not set 106# CONFIG_FTRACE is not set
103CONFIG_ATOMIC64_SELFTEST=y 107CONFIG_CRYPTO_ANSI_CPRNG=y
104CONFIG_VIRTIO_MMIO=y 108CONFIG_ARM64_CRYPTO=y
105CONFIG_VIRTIO_BLK=y 109CONFIG_CRYPTO_SHA1_ARM64_CE=y
110CONFIG_CRYPTO_SHA2_ARM64_CE=y
111CONFIG_CRYPTO_GHASH_ARM64_CE=y
112CONFIG_CRYPTO_AES_ARM64_CE=y
113CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
114CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
115CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y