aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2016-03-26 07:28:26 -0400
committerShawn Guo <shawnguo@kernel.org>2016-04-12 10:31:42 -0400
commit2556247dea686d6fd21f1b4249ec527b9b285201 (patch)
tree2deeabb81d0c3a7f105cdde70ab72dbc8b3162a4
parentd7e7479b215e6ba581bc5e21f43a578e07017b5a (diff)
ARM: multi_v5_defconfig: Enable recommended options for systemd
Enable FHANDLE, CGROUPS, BLK_DEV_BSG and DEVTMPFS as recommended by systemd (which also matches the multi_v7 defconfig). Also enable IPV6, which defaults to 'y' by now. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r--arch/arm/configs/multi_v5_defconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index bb8d60998b70..a822dd346fb2 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -1,14 +1,15 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_FHANDLE=y
2CONFIG_NO_HZ=y 3CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y 4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=19 5CONFIG_LOG_BUF_SHIFT=19
6CONFIG_CGROUPS=y
5CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
6CONFIG_PROFILING=y 8CONFIG_PROFILING=y
7CONFIG_OPROFILE=y 9CONFIG_OPROFILE=y
8CONFIG_KPROBES=y 10CONFIG_KPROBES=y
9CONFIG_MODULES=y 11CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 12CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_ARCH_MULTI_V7 is not set 13# CONFIG_ARCH_MULTI_V7 is not set
13CONFIG_ARCH_MVEBU=y 14CONFIG_ARCH_MVEBU=y
14CONFIG_MACH_KIRKWOOD=y 15CONFIG_MACH_KIRKWOOD=y
@@ -65,13 +66,14 @@ CONFIG_IP_MULTICAST=y
65CONFIG_IP_PNP=y 66CONFIG_IP_PNP=y
66CONFIG_IP_PNP_DHCP=y 67CONFIG_IP_PNP_DHCP=y
67CONFIG_IP_PNP_BOOTP=y 68CONFIG_IP_PNP_BOOTP=y
68# CONFIG_IPV6 is not set
69CONFIG_NET_DSA=y 69CONFIG_NET_DSA=y
70CONFIG_NET_SWITCHDEV=y 70CONFIG_NET_SWITCHDEV=y
71CONFIG_NET_PKTGEN=m 71CONFIG_NET_PKTGEN=m
72CONFIG_CFG80211=y 72CONFIG_CFG80211=y
73CONFIG_MAC80211=y 73CONFIG_MAC80211=y
74CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 74CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
75CONFIG_DEVTMPFS=y
76CONFIG_DEVTMPFS_MOUNT=y
75CONFIG_IMX_WEIM=y 77CONFIG_IMX_WEIM=y
76CONFIG_MTD=y 78CONFIG_MTD=y
77CONFIG_MTD_CMDLINE_PARTS=y 79CONFIG_MTD_CMDLINE_PARTS=y